From 39a3382157a531bbbf518d6ac470a94e150e27f5 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Mon, 30 Apr 2012 17:53:28 -0400
Subject: [PATCH] CC-3736: Full Install fail at Ubuntu 12.04: virtualenv
 problem

-should be fixed
---
 install_full/ubuntu/airtime-full-install-nginx      | 2 +-
 python_apps/pypo/airtime-playout-init-d             | 4 ++--
 python_apps/python-virtualenv/virtualenv-install.sh | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/install_full/ubuntu/airtime-full-install-nginx b/install_full/ubuntu/airtime-full-install-nginx
index 049168739..c474f255d 100755
--- a/install_full/ubuntu/airtime-full-install-nginx
+++ b/install_full/ubuntu/airtime-full-install-nginx
@@ -38,7 +38,7 @@ apt-get update
 
 # Updated package list
 apt-get -y install tar gzip curl nginx php5-pgsql php5-fpm \
-php-pear php5-gd postgresql odbc-postgresql python2.6 libsoundtouch-ocaml \
+php-pear php5-gd postgresql odbc-postgresql python libsoundtouch-ocaml \
 libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
 libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \
 php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \
diff --git a/python_apps/pypo/airtime-playout-init-d b/python_apps/pypo/airtime-playout-init-d
index a640cd312..8cecf7c36 100755
--- a/python_apps/pypo/airtime-playout-init-d
+++ b/python_apps/pypo/airtime-playout-init-d
@@ -28,7 +28,7 @@ liquidsoap_start () {
 
 liquidsoap_stop () {
         monit unmonitor airtime-liquidsoap >/dev/null 2>&1
-        /usr/lib/airtime/airtime_virtualenv/bin/python2.6 /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_prepare_terminate.py
+        /usr/lib/airtime/airtime_virtualenv/bin/python /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_prepare_terminate.py
         
         # Send TERM after 5 seconds, wait at most 30 seconds.
         start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE1
@@ -65,7 +65,7 @@ monit_restart() {
         start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE0
         rm -f $PIDFILE0
         
-        /usr/lib/airtime/airtime_virtualenv/bin/python2.6 /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_prepare_terminate.py
+        /usr/lib/airtime/airtime_virtualenv/bin/python /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_prepare_terminate.py
         start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE1
         rm -f $PIDFILE1
         
diff --git a/python_apps/python-virtualenv/virtualenv-install.sh b/python_apps/python-virtualenv/virtualenv-install.sh
index 47769ba89..0d9a2e2b8 100755
--- a/python_apps/python-virtualenv/virtualenv-install.sh
+++ b/python_apps/python-virtualenv/virtualenv-install.sh
@@ -51,14 +51,17 @@ fi
 echo -e "\n*** Installing Python Libraries ***"
 /usr/lib/airtime/airtime_virtualenv/bin/pip install ${SCRIPTPATH}/airtime_virtual_env.pybundle || exit 1
 
+PYTHON_VERSION=$(python -c "import sys; print 'python%s.%s' % (sys.version_info[0], sys.version_info[1])")
+
 echo -e "\n*** Patching Python Libraries ***"
+echo " * Patching virtualenv libraries in /usr/lib/airtime/airtime_virtualenv/lib/$PYTHON_VERSION"
 PATCHES=${SCRIPTPATH}/patches/*
 for file in $(find $PATCHES -print); do
 if [ -d $file ]; then
     DIRNAME=$(basename $file)
     echo -e "\n   ---Applying Patches for $DIRNAME---"
 else
-    patch -N -p7 -i $file -d /usr/lib/airtime/airtime_virtualenv/lib/python2.7/
+    patch -N -p7 -i $file -d /usr/lib/airtime/airtime_virtualenv/lib/$PYTHON_VERSION
 fi
 done
 exit 0