From cdcc8ee5ade937f0922fee5767bee4c7aec19e61 Mon Sep 17 00:00:00 2001
From: james <james@james-P35-DS3L.(none)>
Date: Wed, 26 Oct 2011 10:41:21 -0400
Subject: [PATCH] CC-2935: Upgrade: delete virtualenv dir and reinstall
 virtualenv

- done
- we reinstall virtualenv on anycase, so we don't need virtualenv-check
---
 .../python-virtualenv/virtualenv-check        | 27 --------
 .../python-virtualenv/virtualenv-check.py     | 11 ----
 .../python-virtualenv/virtualenv-install.sh   | 62 ++++++++++---------
 3 files changed, 32 insertions(+), 68 deletions(-)
 delete mode 100755 python_apps/python-virtualenv/virtualenv-check
 delete mode 100644 python_apps/python-virtualenv/virtualenv-check.py

diff --git a/python_apps/python-virtualenv/virtualenv-check b/python_apps/python-virtualenv/virtualenv-check
deleted file mode 100755
index 53f97fff6..000000000
--- a/python_apps/python-virtualenv/virtualenv-check
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# Absolute path to this script
-SCRIPT=`readlink -f $0`
-# Absolute directory this script is in
-SCRIPTPATH=`dirname $SCRIPT`
-
-VIRTUAL_ENV_DIR="/usr/lib/airtime/airtime_virtualenv"
-if [ -d $VIRTUAL_ENV_DIR ]; then
-    virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
-    
-    if [ -f ${virtualenv_bin}activate ]; then
-        . ${virtualenv_bin}activate
-    else
-        echo 1
-        exit 0
-    fi
-    
-    CHECK=$(python ${SCRIPTPATH}/virtualenv-check.py)
-    if [ "$CHECK" == "1" ]; then
-        echo 1
-        exit 0
-    fi
-    echo 0
-else
-    echo 1
-fi
\ No newline at end of file
diff --git a/python_apps/python-virtualenv/virtualenv-check.py b/python_apps/python-virtualenv/virtualenv-check.py
deleted file mode 100644
index 27c491fe1..000000000
--- a/python_apps/python-virtualenv/virtualenv-check.py
+++ /dev/null
@@ -1,11 +0,0 @@
-try:
-    import amqplib
-    import anyjson
-    import configobj
-    import kombu
-    import mutagen
-    import poster
-    import pyinotify
-    print 0
-except ImportError, e:
-    print 1
\ No newline at end of file
diff --git a/python_apps/python-virtualenv/virtualenv-install.sh b/python_apps/python-virtualenv/virtualenv-install.sh
index 6eaa9053b..98d527d06 100755
--- a/python_apps/python-virtualenv/virtualenv-install.sh
+++ b/python_apps/python-virtualenv/virtualenv-install.sh
@@ -6,36 +6,38 @@ SCRIPTPATH=`dirname $SCRIPT`
 
 VIRTUAL_ENV_DIR="/usr/lib/airtime/airtime_virtualenv"
 VIRTUAL_ENV_SHARE="/usr/share/python-virtualenv/"
-CHECK=$(${SCRIPTPATH}/virtualenv-check)
-if [ "$CHECK" == "1" ]; then
-    echo -e "\n*** Creating Virtualenv for Airtime ***"
-    EXTRAOPTION=$(virtualenv --help | grep extra-search-dir)
 
-    if [ "$?" -eq "0" ]; then
-        virtualenv --extra-search-dir=${SCRIPTPATH}/3rd_party --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv || exit 1
-    else
-        # copy distribute-0.6.10.tar.gz to /usr/share/python-virtualenv/
-        # this is due to the bug in virtualenv 1.4.9
-        if [ -d "$VIRTUAL_ENV_SHARE" ]; then
-            cp ${SCRIPTPATH}/3rd_party/distribute-0.6.10.tar.gz /usr/share/python-virtualenv/
-        fi
-        virtualenv --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv || exit 1
-    fi
-    
-    echo -e "\n*** Installing Python Libraries ***"
-    /usr/lib/airtime/airtime_virtualenv/bin/pip install ${SCRIPTPATH}/airtime_virtual_env.pybundle -E /usr/lib/airtime/airtime_virtualenv || exit 1
-    
-    echo -e "\n*** Patching Python Libraries ***"
-    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 -p0 -i $file
-        fi
-    done
-else
+if [ -d $VIRTUAL_ENV_DIR ]; then
     echo -e "\n*** Existing Airtime Virtualenv Found ***"
-fi 
+    rm -rf ${VIRTUAL_ENV_DIR}
+    echo -e "\n*** Reinstalling Airtime Virtualenv ***"
+fi
+
+echo -e "\n*** Creating Virtualenv for Airtime ***"
+EXTRAOPTION=$(virtualenv --help | grep extra-search-dir)
+
+if [ "$?" -eq "0" ]; then
+virtualenv --extra-search-dir=${SCRIPTPATH}/3rd_party --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv || exit 1
+else
+# copy distribute-0.6.10.tar.gz to /usr/share/python-virtualenv/
+# this is due to the bug in virtualenv 1.4.9
+if [ -d "$VIRTUAL_ENV_SHARE" ]; then
+    cp ${SCRIPTPATH}/3rd_party/distribute-0.6.10.tar.gz /usr/share/python-virtualenv/
+fi
+virtualenv --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv || exit 1
+fi
+
+echo -e "\n*** Installing Python Libraries ***"
+/usr/lib/airtime/airtime_virtualenv/bin/pip install ${SCRIPTPATH}/airtime_virtual_env.pybundle -E /usr/lib/airtime/airtime_virtualenv || exit 1
+
+echo -e "\n*** Patching Python Libraries ***"
+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 -p0 -i $file
+fi
+done
 exit 0