Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
martin 2011-07-19 16:35:29 -04:00
commit 10ee6aaa1d
16 changed files with 64 additions and 172 deletions

View file

@ -1,5 +1,8 @@
#!/bin/bash
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

View file

@ -1,5 +1,8 @@
#!/bin/bash
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
@ -29,7 +32,6 @@ python ${SCRIPTPATH}/../python_apps/remove-pypo-user.py
php ${SCRIPTPATH}/include/airtime-uninstall.php
echo -e "\n****************************** Uninstall Complete ******************************\n"
echo "NOTE: To fully remove all Airtime files, you will also have to manually delete"
echo " the directories '/srv/airtime'(default storage location of media files)"