From b4e887eb2d6384874beca7db01a4902d6ef73da5 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 19 Jul 2011 15:06:35 -0400
Subject: [PATCH] temp comit

---
 install/airtime-install                         | 2 +-
 install/airtime-uninstall                       | 3 +--
 python_apps/media-monitor/airtime-media-monitor | 2 +-
 python_apps/pypo/airtime-liquidsoap             | 2 +-
 python_apps/pypo/airtime-playout                | 2 +-
 python_apps/show-recorder/airtime-show-recorder | 2 +-
 utils/airtime-import/airtime-import             | 2 +-
 utils/airtime-update-db-settings                | 3 +++
 8 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/install/airtime-install b/install/airtime-install
index ce6224436..452b87e88 100755
--- a/install/airtime-install
+++ b/install/airtime-install
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-virtualenv_bin="/home/james/temp/bin/"
+virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
 . ${virtualenv_bin}activate
 
 #Cause bash script to exit if any of the installers
diff --git a/install/airtime-uninstall b/install/airtime-uninstall
index 5bdc51d9f..e23884d40 100755
--- a/install/airtime-uninstall
+++ b/install/airtime-uninstall
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-virtualenv_bin="/home/james/temp/bin/"
+virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
 . ${virtualenv_bin}activate
 
 #Cause bash script to exit if any of the installers
@@ -28,7 +28,6 @@ python ${SCRIPTPATH}/../python_apps/remove-pypo-user.py
 
 php ${SCRIPTPATH}/include/airtime-uninstall.php
 
-
 echo -e "\n****************************** Uninstall Complete ******************************\n"
 echo "NOTE: To fully remove all Airtime files, you will also have to manually delete"
 echo "      the directories '/srv/airtime'(default storage location of media files)"
diff --git a/python_apps/media-monitor/airtime-media-monitor b/python_apps/media-monitor/airtime-media-monitor
index 8fbf6bf71..4e8b28727 100755
--- a/python_apps/media-monitor/airtime-media-monitor
+++ b/python_apps/media-monitor/airtime-media-monitor
@@ -2,7 +2,7 @@
 
 # Location of pypo_cli.py Python script
 
-virtualenv_bin="/home/james/temp/bin/"
+virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
 . ${virtualenv_bin}activate
 
 media_monitor_path="/usr/lib/airtime/media-monitor/"
diff --git a/python_apps/pypo/airtime-liquidsoap b/python_apps/pypo/airtime-liquidsoap
index dd30f42e6..a6ce96ab2 100755
--- a/python_apps/pypo/airtime-liquidsoap
+++ b/python_apps/pypo/airtime-liquidsoap
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-virtualenv_bin="/home/james/temp/bin/"
+virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
 . ${virtualenv_bin}activate
 
 ls_user="pypo"
diff --git a/python_apps/pypo/airtime-playout b/python_apps/pypo/airtime-playout
index 22a35f620..dd19d70be 100755
--- a/python_apps/pypo/airtime-playout
+++ b/python_apps/pypo/airtime-playout
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-virtualenv_bin="/home/james/temp/bin/"
+virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
 . ${virtualenv_bin}activate
 
 pypo_user="pypo"
diff --git a/python_apps/show-recorder/airtime-show-recorder b/python_apps/show-recorder/airtime-show-recorder
index 09ee88c49..e5eee9664 100755
--- a/python_apps/show-recorder/airtime-show-recorder
+++ b/python_apps/show-recorder/airtime-show-recorder
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-virtualenv_bin="/home/james/temp/bin/"
+virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
 . ${virtualenv_bin}activate
 
 recorder_user="pypo"
diff --git a/utils/airtime-import/airtime-import b/utils/airtime-import/airtime-import
index 1466fc6f1..1b6d78372 100755
--- a/utils/airtime-import/airtime-import
+++ b/utils/airtime-import/airtime-import
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-virtualenv_bin="/home/james/temp/bin/"
+virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
 . ${virtualenv_bin}activate
 
 airtime_import_path="/usr/lib/airtime/utils/airtime-import/"
diff --git a/utils/airtime-update-db-settings b/utils/airtime-update-db-settings
index 459b6b459..af255803a 100755
--- a/utils/airtime-update-db-settings
+++ b/utils/airtime-update-db-settings
@@ -30,6 +30,9 @@
 #  Determine directories, files
 #-------------------------------------------------------------------------------
 
+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