From bbc095f5345dfea891659082632662b55ff56e7a Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Mon, 5 Jan 2015 15:38:01 -0500
Subject: [PATCH] Added virtualenv back into install process

---
 .../media-monitor/bin/airtime-media-monitor    | 11 +++++------
 python_apps/pypo/bin/airtime-liquidsoap        |  3 ++-
 python_apps/pypo/bin/airtime-playout           | 18 ++++++++++++------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/python_apps/media-monitor/bin/airtime-media-monitor b/python_apps/media-monitor/bin/airtime-media-monitor
index 0af952420..a5e3e4c6d 100755
--- a/python_apps/media-monitor/bin/airtime-media-monitor
+++ b/python_apps/media-monitor/bin/airtime-media-monitor
@@ -1,9 +1,12 @@
 #!/bin/bash
 
-# Location of pypo_cli.py Python script
+virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
+. ${virtualenv_bin}activate
 
 exec 2>&1
 
+cd /usr/lib/airtime/media-monitor/
+
 set +e
 cat /etc/default/locale | grep -i "LANG=.*UTF-\?8"
 set -e
@@ -12,11 +15,7 @@ if [ "$?" != "0" ]; then
     exit 1
 fi
 
-virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
-. ${virtualenv_bin}activate
-
+export PYTHONPATH="/usr/lib/airtime/:/usr/lib/airtime/media-monitor/mm2/"
 export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""`
 
 exec python /usr/lib/airtime/media-monitor/media_monitor.py > /var/log/airtime/media-monitor/py-interpreter.log 2>&1
-
-# EOF
diff --git a/python_apps/pypo/bin/airtime-liquidsoap b/python_apps/pypo/bin/airtime-liquidsoap
index e8e6d45a0..04d39fbbe 100755
--- a/python_apps/pypo/bin/airtime-liquidsoap
+++ b/python_apps/pypo/bin/airtime-liquidsoap
@@ -31,10 +31,11 @@ if [ "$debug" = "t" ]; then
 else
     ls_path="/usr/bin/airtime-liquidsoap --verbose -f -d"
 fi
+
+export PYTHONPATH=/usr/lib/airtime
 ls_param="/usr/lib/airtime/pypo/bin/liquidsoap_scripts/ls_script.liq"
 
 cd /usr/lib/airtime/pypo/bin/liquidsoap_scripts
 python generate_liquidsoap_cfg.py
 
 exec ${ls_path} ${ls_param} 2>&1
-# EOF
diff --git a/python_apps/pypo/bin/airtime-playout b/python_apps/pypo/bin/airtime-playout
index ab99bcf57..d63c3d0e8 100755
--- a/python_apps/pypo/bin/airtime-playout
+++ b/python_apps/pypo/bin/airtime-playout
@@ -1,5 +1,15 @@
 #!/bin/bash
 
+virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
+. ${virtualenv_bin}activate
+
+# Absolute path to this script
+SCRIPT=`readlink -f $0`
+# Absolute directory this script is in
+pypo_path=`dirname $SCRIPT`
+
+cd ${pypo_path}
+
 set +e
 cat /etc/default/locale | grep -i "LANG=.*UTF-\?8" > /dev/null
 set -e
@@ -8,13 +18,9 @@ if [ "$?" != "0" ]; then
     exit 1
 fi
 
-virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
-. ${virtualenv_bin}activate
-
 export HOME="/var/tmp/airtime/pypo/"
+export PYTHONPATH=/usr/lib/airtime/:$PYTHONPATH
 export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""`
 export TERM=xterm
 
-exec python /usr/lib/airtime/pypo/bin/pypocli.py > /var/log/airtime/pypo/py-interpreter.log 2>&1
-
-# EOF
+exec python ${pypo_path}/pypocli.py > /var/log/airtime/pypo/py-interpreter.log 2>&1