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

Merge branch '1.9.1' into devel

Browse source 
Conflicts:
	install_full/ubuntu/airtime-full-install
	utils/airtime-update-db-settings.py
This commit is contained in:
martin 2011-09-15 17:44:07 -04:00
commit b5684bb5b1
20 changed files with 1921 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
install_minimal/airtime-install
View file

@ -26,7 +26,7 @@ echo -e "\n*** Creating Pypo User ***"
python ${SCRIPTPATH}/../python_apps/create-pypo-user.py
set +e
php ${SCRIPTPATH}/include/airtime-install.php $@
php --php-ini ${SCRIPTPATH}/airtime-php.ini --file ${SCRIPTPATH}/include/airtime-install.php $@
result=$?
if [ "$result" -eq "2" ]; then
#We've just finished an upgrade, so let's exit