From 7ef7df86fb1bd394069e1041a5a2524d5b39c10a Mon Sep 17 00:00:00 2001 From: James Date: Thu, 18 Aug 2011 17:47:18 -0400 Subject: [PATCH] CC-2684: airtime_install script tries to copy without checking - fixed --- install_minimal/airtime-install | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index bf20978d4..d1e5afa67 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -14,6 +14,7 @@ SCRIPT=`readlink -f $0` SCRIPTPATH=`dirname $SCRIPT` 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 ***" EXTRAOPTION=$(virtualenv --help | grep extra-search-dir) @@ -21,9 +22,11 @@ if [ ! -d "$VIRTUAL_ENV_DIR" ]; then if [ "$?" -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 distibute-0.6.10.tar.gz to /usr/share/python-virtualenv/ + # copy distribute-0.6.10.tar.gz to /usr/share/python-virtualenv/ # this is due to the bug in virtualenv 1.4.9 - cp ${SCRIPTPATH}/3rd_party/distribute-0.6.10.tar.gz /usr/share/python-virtualenv/ + 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