From 5f137d99a3a802203765f19a388b49c18083705d Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 5 Jan 2015 14:42:53 -0500 Subject: [PATCH] Added virtualenv back into install process --- installer/install | 15 ++++++++++----- .../media-monitor/bin/airtime-media-monitor | 3 +++ python_apps/pypo/bin/airtime-liquidsoap | 2 ++ python_apps/pypo/bin/airtime-playout | 3 +++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/installer/install b/installer/install index b5c7fa17b..9a921f4d7 100755 --- a/installer/install +++ b/installer/install @@ -322,6 +322,12 @@ loudCmd "apt-get -y --force-yes install liquidsoap python python-pip" loudCmd "pip install setuptools" verbose "...Done" +verbose "\n * Activating virtualenv..." +${AIRTIMEROOT}/python_apps/python-virtualenv/virtualenv-install.sh +virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" +. ${virtualenv_bin}activate +verbose "...Done" + verbose "\n * Creating /usr/lib/airtime..." mkdir -p /usr/lib/airtime verbose "...Done" @@ -370,17 +376,16 @@ else fi verbose "...Done" -export PYTHONPATH=$PYTHONPATH/usr/lib/airtime:/usr/lib/airtime/media-monitor:\ -/usr/lib/airtime/media-monitor/mm2:/usr/lib/airtime/pypo:\ -/usr/lib/airtime/media-monitor/mm2/media:/usr/lib/airtime/media-monitor/mm2/saas:\ -/usr/lib/airtime/api_clients:/usr/lib/airtime/std_err_override: - verbose "\n * Creating liquidsoap symlink..." ln -sf /usr/bin/liquidsoap /usr/bin/airtime-liquidsoap verbose "...Done" initctl reload-configuration +verbose "\n * Deactivating virtualenv..." +deactivate +verbose "...Done" + if [ ! -d /var/log/airtime ]; then loud "\n-----------------------------------------------------" loud " * Installing Log Files * " diff --git a/python_apps/media-monitor/bin/airtime-media-monitor b/python_apps/media-monitor/bin/airtime-media-monitor index 6a3692a7b..0af952420 100755 --- a/python_apps/media-monitor/bin/airtime-media-monitor +++ b/python_apps/media-monitor/bin/airtime-media-monitor @@ -12,6 +12,9 @@ if [ "$?" != "0" ]; then exit 1 fi +virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" +. ${virtualenv_bin}activate + export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""` exec python /usr/lib/airtime/media-monitor/media_monitor.py > /var/log/airtime/media-monitor/py-interpreter.log 2>&1 diff --git a/python_apps/pypo/bin/airtime-liquidsoap b/python_apps/pypo/bin/airtime-liquidsoap index 6b5d1470d..e8e6d45a0 100755 --- a/python_apps/pypo/bin/airtime-liquidsoap +++ b/python_apps/pypo/bin/airtime-liquidsoap @@ -22,6 +22,8 @@ do shift done +virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" +. ${virtualenv_bin}activate export HOME="/var/tmp/airtime/pypo/" if [ "$debug" = "t" ]; then diff --git a/python_apps/pypo/bin/airtime-playout b/python_apps/pypo/bin/airtime-playout index f537a6b85..ab99bcf57 100755 --- a/python_apps/pypo/bin/airtime-playout +++ b/python_apps/pypo/bin/airtime-playout @@ -8,6 +8,9 @@ if [ "$?" != "0" ]; then exit 1 fi +virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" +. ${virtualenv_bin}activate + export HOME="/var/tmp/airtime/pypo/" export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""` export TERM=xterm