temp comit

install/airtime-install

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+virtualenv_bin="/home/james/temp/bin/"
+. ${virtualenv_bin}activate
+
 #Cause bash script to exit if any of the installers
 #return with a non-zero return value.
 set -e

install/airtime-uninstall

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+virtualenv_bin="/home/james/temp/bin/"
+. ${virtualenv_bin}activate
+
 #Cause bash script to exit if any of the installers
 #return with a non-zero return value.
 set -e

python_apps/media-monitor/airtime-media-monitor

@@ -1,10 +1,15 @@
 #!/bin/sh
 
 # Location of pypo_cli.py Python script
+
+virtualenv_bin="/home/james/temp/bin/"
+. ${virtualenv_bin}activate
+
 media_monitor_path="/usr/lib/airtime/media-monitor/"
 media_monitor_script="MediaMonitor.py"
 
 api_client_path="/usr/lib/airtime/pypo/"
+
 cd ${media_monitor_path}
 
 exec 2>&1

python_apps/pypo/airtime-liquidsoap

@@ -1,4 +1,8 @@
 #!/bin/sh
+
+virtualenv_bin="/home/james/temp/bin/"
+. ${virtualenv_bin}activate
+
 ls_user="pypo"
 export HOME="/var/tmp/airtime/pypo/"
 api_client_path="/usr/lib/airtime/pypo/"

python_apps/pypo/airtime-playout

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+virtualenv_bin="/home/james/temp/bin/"
+. ${virtualenv_bin}activate
+
 pypo_user="pypo"
 
 # Location of pypo_cli.py Python script

python_apps/show-recorder/airtime-show-recorder

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+virtualenv_bin="/home/james/temp/bin/"
+. ${virtualenv_bin}activate
+
 recorder_user="pypo"
 
 

utils/airtime-import/airtime-import

@@ -1,6 +1,8 @@
 #!/bin/sh
 
-# Location of pypo_cli.py Python script
+virtualenv_bin="/home/james/temp/bin/"
+. ${virtualenv_bin}activate
+
 airtime_import_path="/usr/lib/airtime/utils/airtime-import/"
 airtime_import_script="airtime-import.py"
 

utils/airtime-import/airtime-import.py

@@ -195,7 +195,7 @@ def StorageSetAction(option, opt, value, parser):
             parser.rargs.remove('--force')
     if(not bypass):
         errorIfMultipleOption(parser.rargs, "Only [-f] and [--force] option is allowed with this option.")
-        possibleInput = {'y','Y','n','N'}
+        possibleInput = ['y','Y','n','N']
         confirm = raw_input("Are you sure you want to change the storage direcory? (y/N)")
         confirm = confirm or 'N'
         while(confirm  not in possibleInput):