From 1ba200441e46e9de71bb66dcaf43ba80b24ae41a Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Fri, 9 Sep 2011 15:38:14 -0400
Subject: [PATCH] CC-2792: installing Airtime 2.0 beta fails on ubuntu 10.04 64
 bit

-possibly fixed
---
 install_minimal/airtime-install               | 36 -------------------
 .../python-virtualenv/virtualenv-install.sh   |  3 --
 2 files changed, 39 deletions(-)

diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install
index 9010545c7..532aba7b9 100755
--- a/install_minimal/airtime-install
+++ b/install_minimal/airtime-install
@@ -18,42 +18,6 @@ SCRIPT=`readlink -f $0`
 SCRIPTPATH=`dirname $SCRIPT`
 
 ${SCRIPTPATH}/../python_apps/python-virtualenv/virtualenv-install.sh
-VIRTUAL_ENV_DIR="/usr/lib/airtime/airtime_virtualenv"
-VIRTUAL_ENV_SHARE="/usr/share/python-virtualenv/"
-if [ ! -d "$VIRTUAL_ENV_DIR" ]; then
-    echo -e "\n*** Creating Virtualenv for Airtime ***"
-    set +e
-    virtualenv --help | grep extra-search-dir
-    EXTRAOPTION=$?
-    set -e
-
-    if [ $EXTRAOPTION -eq "0" ]; then
-        sudo virtualenv --extra-search-dir=${SCRIPTPATH}/3rd_party --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv
-    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
-        sudo virtualenv --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv
-    fi
-    
-    echo -e "\n*** Installing Python Libraries ***"
-    sudo /usr/lib/airtime/airtime_virtualenv/bin/pip install ${SCRIPTPATH}/airtime_virtual_env.pybundle -E /usr/lib/airtime/airtime_virtualenv
-    
-    echo -e "\n*** Patching Python Libraries ***"
-    PACHES=${SCRIPTPATH}/patches/*
-    for file in $(find $PACHES -print); do
-        if [ -d $file ]; then
-            DIRNAME=$(basename $file)
-            echo -e "\n   ---Applying Patches for $DIRNAME---"
-        else
-            sudo patch -N -p0 -i $file
-        fi
-    done
-else
-    echo -e "\n*** Existing Airtime Virtualenv Found ***"
-fi 
 
 virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
 . ${virtualenv_bin}activate
diff --git a/python_apps/python-virtualenv/virtualenv-install.sh b/python_apps/python-virtualenv/virtualenv-install.sh
index 88a1ed7b5..902d9d29b 100755
--- a/python_apps/python-virtualenv/virtualenv-install.sh
+++ b/python_apps/python-virtualenv/virtualenv-install.sh
@@ -36,6 +36,3 @@ if [ ! -d "$VIRTUAL_ENV_DIR" ]; then
 else
     echo -e "\n*** Existing Airtime Virtualenv Found ***"
 fi 
-
-virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
-. ${virtualenv_bin}activate