run.sh now uses virtualenv properly

Author: lepinkainen

pyfibot/modules/module_update.py

@@ -1,3 +1,4 @@
+
 from __future__ import unicode_literals, print_function, division
 import subprocess
 import sys
@@ -38,17 +39,19 @@ def command_update(bot, user, channel, args):
         bot.say(channel, "Errors: %s" % err)
 
     # fetch new required packages if needed
-    cmd = ['../bin/pip', 'install', '-r', '../requirements.txt']
+    cmd = ['pip', 'install', '--upgrade', '--requirement', '../requirements.txt']
     log.debug("executing pip install in %s" % cwd)
 
     p = subprocess.Popen(cmd, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     res = p.wait()
     out, err = p.communicate()
 
     if res:
-        bot.say(channel, "Update failed:")
+        bot.say(channel, "Package update failed:")
         for line in out.split("\n"):
             bot.say(channel, "%s" % line)
+        for line in err.split("\n"):
+            bot.say(channel, "%s" % line)
     else:
         bot.say(channel, "Package status OK")
         pip_ok = True

run.sh

@@ -1,6 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 if [ ! -x databases/ ]; then
   mkdir databases
 fi;
 
-bin/python pyfibot/pyfibot.py config.yml
+source bin/activate
+python pyfibot/pyfibot.py config.yml