reaktor: move config_filename to config

2 files changed, 10 insertions, 5 deletions

diff --git a/Reaktor/IRC/reaktor.py b/Reaktor/IRC/reaktor.py
index 54091c5d..bfd08d9f 100755
--- a/Reaktor/IRC/reaktor.py
+++ b/Reaktor/IRC/reaktor.py
@@ -81,7 +81,6 @@ class Reaktor(asybot):
       target.append(env['_from'])
     log.debug('target:' +str(target))
 
-    env['config_filename'] = os.path.abspath(self.config)
     start = time()
     try:
       p = popen(myargv, bufsize=1, stdout=PIPE, stderr=PIPE, env=env, cwd=cwd)
diff --git a/Reaktor/config.py b/Reaktor/config.py
index 90540340..7f3f9c40 100644
--- a/Reaktor/config.py
+++ b/Reaktor/config.py
@@ -1,4 +1,4 @@
-from os.path import expanduser
+from os.path import abspath, expanduser
 import re
 
 debug = True
@@ -20,18 +20,24 @@ irc_channels = [
 admin_file='admin.lst'
 auth_file='auth.lst'
 
+config_filename = abspath(__file__)
+
 # me is used, so name cannot kill our patterns below
 me = '\\b' + re.escape(name) + '\\b'
 me_or_us = '(?:' + me + '|\\*)'
 
-def default_command(cmd):
+def default_command(cmd, env={}):
   return {
     'capname': cmd,
     'pattern': '^' + me_or_us + ':\\s*' + cmd + '\\s*(?:\\s+(?P<args>.*))?$',
-    'argv': [ 'commands/' + cmd ] }
+    'argv': [ 'commands/' + cmd ],
+    'env': env
+  }
 
 public_commands = [
-  default_command('caps'),
+  default_command('caps', env={
+    'config_filename': config_filename
+  }),
   default_command('hello'),
   default_command('badcommand'),
   default_command('rev'),