diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index d1e5afa67..242725cd9 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -13,47 +13,12 @@ SCRIPT=`readlink -f $0` # Absolute directory this script is in 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) - - 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 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 - #Cause bash script to exit if any of the installers #return with a non-zero return value. set -e +${SCRIPTPATH}/../python_apps/python-virtualenv/virtualenv-install.sh + echo -e "\n*** Creating Pypo User ***" python ${SCRIPTPATH}/../python_apps/create-pypo-user.py diff --git a/install_minimal/3rd_party/distribute-0.6.10.tar.gz b/python_apps/python-virtualenv/3rd_party/distribute-0.6.10.tar.gz similarity index 100% rename from install_minimal/3rd_party/distribute-0.6.10.tar.gz rename to python_apps/python-virtualenv/3rd_party/distribute-0.6.10.tar.gz diff --git a/install_minimal/3rd_party/pip-1.0.2.tar.gz b/python_apps/python-virtualenv/3rd_party/pip-1.0.2.tar.gz similarity index 100% rename from install_minimal/3rd_party/pip-1.0.2.tar.gz rename to python_apps/python-virtualenv/3rd_party/pip-1.0.2.tar.gz diff --git a/install_minimal/3rd_party/setuptools-0.6c11-py2.6.egg b/python_apps/python-virtualenv/3rd_party/setuptools-0.6c11-py2.6.egg similarity index 100% rename from install_minimal/3rd_party/setuptools-0.6c11-py2.6.egg rename to python_apps/python-virtualenv/3rd_party/setuptools-0.6c11-py2.6.egg diff --git a/install_minimal/airtime_virtual_env.pybundle b/python_apps/python-virtualenv/airtime_virtual_env.pybundle similarity index 100% rename from install_minimal/airtime_virtual_env.pybundle rename to python_apps/python-virtualenv/airtime_virtual_env.pybundle diff --git a/install_minimal/patches/mutagen/mutagen_patch1.patch b/python_apps/python-virtualenv/patches/mutagen/mutagen_patch1.patch similarity index 100% rename from install_minimal/patches/mutagen/mutagen_patch1.patch rename to python_apps/python-virtualenv/patches/mutagen/mutagen_patch1.patch diff --git a/install_minimal/patches/mutagen/mutagen_patch2.patch b/python_apps/python-virtualenv/patches/mutagen/mutagen_patch2.patch similarity index 100% rename from install_minimal/patches/mutagen/mutagen_patch2.patch rename to python_apps/python-virtualenv/patches/mutagen/mutagen_patch2.patch