diff --git a/python_apps/python-virtualenv/virtualenv-check b/python_apps/python-virtualenv/virtualenv-check new file mode 100755 index 000000000..53f97fff6 --- /dev/null +++ b/python_apps/python-virtualenv/virtualenv-check @@ -0,0 +1,27 @@ +#!/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 new file mode 100644 index 000000000..27c491fe1 --- /dev/null +++ b/python_apps/python-virtualenv/virtualenv-check.py @@ -0,0 +1,11 @@ +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 902d9d29b..a6b63a540 100755 --- a/python_apps/python-virtualenv/virtualenv-install.sh +++ b/python_apps/python-virtualenv/virtualenv-install.sh @@ -1,3 +1,4 @@ +#!/bin/bash # Absolute path to this script SCRIPT=`readlink -f $0` # Absolute directory this script is in @@ -5,23 +6,24 @@ SCRIPTPATH=`dirname $SCRIPT` VIRTUAL_ENV_DIR="/usr/lib/airtime/airtime_virtualenv" VIRTUAL_ENV_SHARE="/usr/share/python-virtualenv/" -if [ ! -d "$VIRTUAL_ENV_DIR" ]; then +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 - sudo virtualenv --extra-search-dir=${SCRIPTPATH}/3rd_party --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv + 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 + 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 + /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 ***" PATCHES=${SCRIPTPATH}/patches/* @@ -30,9 +32,10 @@ if [ ! -d "$VIRTUAL_ENV_DIR" ]; then DIRNAME=$(basename $file) echo -e "\n ---Applying Patches for $DIRNAME---" else - sudo patch -N -p0 -i $file + patch -N -p0 -i $file fi done else echo -e "\n*** Existing Airtime Virtualenv Found ***" fi +exit 0