More work on getting services working with new installer

python_apps/pypo/bin/airtime-liquidsoap

@@ -22,9 +22,6 @@ do
     shift
 done
 
-virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
-. ${virtualenv_bin}activate
-
 export HOME="/var/tmp/airtime/pypo/"
 if [ "$debug" = "t" ]; then
     ls_path="/usr/bin/airtime-liquidsoap --verbose -f"
@@ -32,7 +29,7 @@ else
     ls_path="/usr/bin/airtime-liquidsoap --verbose -f -d"
 fi
 
-export PYTHONPATH=/usr/lib/airtime
+export PYTHONPATH=/usr/lib/airtime/:/usr/lib/airtime/pypo/bin/:/usr/lib/airtime/std_err_override/:/usr/lib/airtime/api_clients:$PYTHONPATH
 ls_param="/usr/lib/airtime/pypo/bin/liquidsoap_scripts/ls_script.liq"
 
 cd /usr/lib/airtime/pypo/bin/liquidsoap_scripts

python_apps/pypo/bin/airtime-playout

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
-. ${virtualenv_bin}activate
-
 set +e
 cat /etc/default/locale | grep -i "LANG=.*UTF-\?8" > /dev/null
 set -e
@@ -12,7 +9,7 @@ if [ "$?" != "0" ]; then
 fi
 
 export HOME="/var/tmp/airtime/pypo/"
-export PYTHONPATH=/usr/lib/airtime/:$PYTHONPATH
+export PYTHONPATH=/usr/lib/airtime/:/usr/lib/airtime/pypo/bin/:/usr/lib/airtime/pypo/bin/pypo:/usr/lib/airtime/std_err_override/:/usr/lib/airtime/api_clients:$PYTHONPATH
 export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""`
 export TERM=xterm