Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added virtualenv back into install process

This commit is contained in:
Duncan Sommerville 2015-01-05 14:42:53 -05:00
parent 97ef6a3150
commit 5f137d99a3
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
installer/install
View File

@ -322,6 +322,12 @@ loudCmd "apt-get -y --force-yes install liquidsoap python python-pip"
loudCmd "pip install setuptools" loudCmd "pip install setuptools"
verbose "...Done" 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..." verbose "\n * Creating /usr/lib/airtime..."
mkdir -p /usr/lib/airtime mkdir -p /usr/lib/airtime
verbose "...Done" verbose "...Done"
@ -370,17 +376,16 @@ else
fi fi
verbose "...Done" 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..." verbose "\n * Creating liquidsoap symlink..."
ln -sf /usr/bin/liquidsoap /usr/bin/airtime-liquidsoap ln -sf /usr/bin/liquidsoap /usr/bin/airtime-liquidsoap
verbose "...Done" verbose "...Done"
initctl reload-configuration initctl reload-configuration
verbose "\n * Deactivating virtualenv..."
deactivate
verbose "...Done"
if [ ! -d /var/log/airtime ]; then if [ ! -d /var/log/airtime ]; then
loud "\n-----------------------------------------------------" loud "\n-----------------------------------------------------"
loud " * Installing Log Files * " loud " * Installing Log Files * "

3
python_apps/media-monitor/bin/airtime-media-monitor
View File

@ -12,6 +12,9 @@ if [ "$?" != "0" ]; then
exit 1 exit 1
fi 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\""` 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 exec python /usr/lib/airtime/media-monitor/media_monitor.py > /var/log/airtime/media-monitor/py-interpreter.log 2>&1

2
python_apps/pypo/bin/airtime-liquidsoap
View File

@ -22,6 +22,8 @@ do
shift shift
done done
virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
. ${virtualenv_bin}activate
export HOME="/var/tmp/airtime/pypo/" export HOME="/var/tmp/airtime/pypo/"
if [ "$debug" = "t" ]; then if [ "$debug" = "t" ]; then

3
python_apps/pypo/bin/airtime-playout
View File

@ -8,6 +8,9 @@ if [ "$?" != "0" ]; then
exit 1 exit 1
fi fi
virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
. ${virtualenv_bin}activate
export HOME="/var/tmp/airtime/pypo/" export HOME="/var/tmp/airtime/pypo/"
export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""` export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""`
export TERM=xterm export TERM=xterm