eval - make !SYSTEM report stderr too

[erebus.git] / modules / eval.py

diff --git a/modules/eval.py b/modules/eval.py
index 77f6a1adcb12a332c08e00a8f420990fe734337b..3930b6ddc30f9db1004e0ff983c9495d4800dbfc 100644 (file)
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -19,9 +19,12 @@ modstart = lib.modstart
 modstop = lib.modstop
 
 # module code
+import subprocess
 import sys
-import ctlmod
 
+# import these to make life easier using this module
+import os
+import ctlmod
 
 def module(name):
        return lib.mod(name)
@@ -49,6 +52,21 @@ def cmd_exec(bot, user, chan, realtarget, *args):
        except Exception: bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
        else: bot.msg(replyto, "Done.")
 
+@lib.hook(needchan=False, wantchan=True, glevel=lib.OWNER)
+@lib.help('<command line>', 'think os.system')
+@lib.argsGE(1)
+def system(bot, user, chan, realtarget, *args):
+       if chan is not None: replyto = chan
+       else: replyto = user
+
+       try:
+               proc = subprocess.Popen(' '.join(args), shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True)
+       except Exception:
+               bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
+       else:
+               for line in proc.stdout:
+                       bot.msg(replyto, line.decode('utf-8', 'surrogateescape'))
+
 @lib.hook('exception', needchan=False, glevel=lib.OWNER)
 @lib.help(None, "cause an exception")
 def cmd_exception(*args, **kwargs):