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

Merge branch '2.1.x' into devel

Browse source
This commit is contained in:
denise 2012-07-04 09:46:30 -04:00
commit bc93119adc
12 changed files with 67 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

4
install_minimal/airtime-install
View file

@ -152,10 +152,6 @@ fi
if [ -e /etc/init.d/airtime-playout ]; then
invoke-rc.d airtime-playout stop > /dev/null 2>&1
fi
if [ -e /etc/init.d/airtime-show-recorder ]; then
invoke-rc.d airtime-show-recorder stop > /dev/null 2>&1
fi
#export these variables to make them available in sub bash scripts
export DO_UPGRADE

2
install_minimal/include/airtime-constants.php
View file

@ -1,3 +1,3 @@
<?php
define('AIRTIME_VERSION', '2.1.2');
define('AIRTIME_VERSION', '2.1.3');

6
install_minimal/include/airtime-upgrade.php
View file

@ -111,6 +111,10 @@ if (strcmp($version, "2.1.1") < 0){
if (strcmp($version, "2.1.2") < 0){
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.1.2/airtime-upgrade.php");
pause();
}
}
if (strcmp($version, "2.1.3") < 0){
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.1.3/airtime-upgrade.php");
pause();
}
echo "******************************* Upgrade Complete *******************************".PHP_EOL;