From c66e6aa8497d7467dedbb231120e89564864b699 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 7 Jan 2015 10:01:32 -0500 Subject: [PATCH] More work on getting services working with new installer --- installer/install | 18 +----------------- .../media-monitor/bin/airtime-media-monitor | 5 ++--- python_apps/pypo/bin/airtime-liquidsoap | 5 +---- python_apps/pypo/bin/airtime-playout | 5 +---- 4 files changed, 5 insertions(+), 28 deletions(-) diff --git a/installer/install b/installer/install index 5aa74bc6a..0168d5348 100755 --- a/installer/install +++ b/installer/install @@ -318,16 +318,10 @@ loud " * Installing Airtime Services * " loud "-----------------------------------------------------" verbose "\n * Installing liquidsoap and python..." -loudCmd "apt-get -y --force-yes install liquidsoap python python-pip python-virtualenv" +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" @@ -359,8 +353,6 @@ elif [ "$in_place" = "t" ]; then else python /usr/share/airtime/python_apps/media-monitor/setup.py install fi -chown ${web_user}:${web_user} /usr/lib/airtime/airtime_virtualenv/bin/airtime-media-monitor -ln -sf /usr/lib/airtime/airtime_virtualenv/bin/airtime-media-monitor /usr/local/bin/airtime-media-monitor verbose "...Done" verbose "\n * Copying pypo files..." @@ -376,22 +368,14 @@ elif [ "$in_place" = "t" ]; then else python /usr/share/airtime/python_apps/pypo/setup.py install fi -chown ${web_user}:${web_user} /usr/lib/airtime/airtime_virtualenv/bin/airtime-playout -ln -sf /usr/lib/airtime/airtime_virtualenv/bin/airtime-playout /usr/local/bin/airtime-playout verbose "...Done" verbose "\n * Creating liquidsoap symlink..." -chown ${web_user}:${web_user} /usr/lib/airtime/airtime_virtualenv/bin/airtime-liquidsoap -ln -sf /usr/lib/airtime/airtime_virtualenv/bin/airtime-liquidsoap /usr/local/bin/airtime-liquidsoap 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 a5e3e4c6d..efe75c4a6 100755 --- a/python_apps/media-monitor/bin/airtime-media-monitor +++ b/python_apps/media-monitor/bin/airtime-media-monitor @@ -1,8 +1,5 @@ #!/bin/bash -virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" -. ${virtualenv_bin}activate - exec 2>&1 cd /usr/lib/airtime/media-monitor/ @@ -15,6 +12,8 @@ if [ "$?" != "0" ]; then exit 1 fi +export PYTHONPATH=/usr/lib/airtime/:/usr/lib/airtime/media-monitor/airtimefilemonitor/:/usr/lib/airtime/media-monitor/media-monitor/airtimefilemonitor:\ +/usr/lib/airtime/media-monitor/mm2/:/usr/lib/airtime/std_err_override/:/usr/lib/airtime/api_clients:$PYTHONPATH export PYTHONPATH="/usr/lib/airtime/:/usr/lib/airtime/media-monitor/mm2/" export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""` diff --git a/python_apps/pypo/bin/airtime-liquidsoap b/python_apps/pypo/bin/airtime-liquidsoap index 04d39fbbe..e4723960f 100755 --- a/python_apps/pypo/bin/airtime-liquidsoap +++ b/python_apps/pypo/bin/airtime-liquidsoap @@ -22,9 +22,6 @@ do shift done -virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" -. ${virtualenv_bin}activate - export HOME="/var/tmp/airtime/pypo/" if [ "$debug" = "t" ]; then ls_path="/usr/bin/airtime-liquidsoap --verbose -f" @@ -32,7 +29,7 @@ else ls_path="/usr/bin/airtime-liquidsoap --verbose -f -d" fi -export PYTHONPATH=/usr/lib/airtime +export PYTHONPATH=/usr/lib/airtime/:/usr/lib/airtime/pypo/bin/:/usr/lib/airtime/std_err_override/:/usr/lib/airtime/api_clients:$PYTHONPATH ls_param="/usr/lib/airtime/pypo/bin/liquidsoap_scripts/ls_script.liq" cd /usr/lib/airtime/pypo/bin/liquidsoap_scripts diff --git a/python_apps/pypo/bin/airtime-playout b/python_apps/pypo/bin/airtime-playout index cb2d3ea94..1358f033f 100755 --- a/python_apps/pypo/bin/airtime-playout +++ b/python_apps/pypo/bin/airtime-playout @@ -1,8 +1,5 @@ #!/bin/bash -virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" -. ${virtualenv_bin}activate - set +e cat /etc/default/locale | grep -i "LANG=.*UTF-\?8" > /dev/null set -e @@ -12,7 +9,7 @@ if [ "$?" != "0" ]; then fi export HOME="/var/tmp/airtime/pypo/" -export PYTHONPATH=/usr/lib/airtime/:$PYTHONPATH +export PYTHONPATH=/usr/lib/airtime/:/usr/lib/airtime/pypo/bin/:/usr/lib/airtime/pypo/bin/pypo:/usr/lib/airtime/std_err_override/:/usr/lib/airtime/api_clients:$PYTHONPATH export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""` export TERM=xterm