diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index 031673c19..b395f409b 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -33,10 +33,8 @@ python ${SCRIPTPATH}/../python_apps/create-pypo-user.py set +e php --php-ini ${SCRIPTPATH}/airtime-php.ini ${SCRIPTPATH}/include/airtime-install.php $@ result=$? -if [ "$result" -eq "2" ]; then - #We've just finished an upgrade, so let's exit - exit 0 -elif [ "$result" -ne "0" ]; then + +if [ "$result" -ne "0" ]; then #There was an error, exit with error code. echo "There was an error during upgrade. Exit code $result" exit 1 diff --git a/install_minimal/include/airtime-install.php b/install_minimal/include/airtime-install.php index 6ab5e75cd..683e95293 100644 --- a/install_minimal/include/airtime-install.php +++ b/install_minimal/include/airtime-install.php @@ -64,8 +64,7 @@ if (isset($version) && ($version != false) && ($version < AIRTIME_VERSION) && !i echo "Airtime version $version found.".PHP_EOL; require_once("airtime-upgrade.php"); - - exit(2); + exit(0); } if($version === false){ diff --git a/install_minimal/include/airtime-upgrade.php b/install_minimal/include/airtime-upgrade.php index 616083c69..6281fe890 100644 --- a/install_minimal/include/airtime-upgrade.php +++ b/install_minimal/include/airtime-upgrade.php @@ -116,6 +116,7 @@ $newVersion = AIRTIME_VERSION; $sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '$newVersion')"; $CC_DBC->query($sql); +/* echo PHP_EOL."*** Updating Api Client ***".PHP_EOL; passthru("python $SCRIPTPATH/../../python_apps/api_clients/install/api_client_install.py"); @@ -134,3 +135,4 @@ sleep(4); passthru("airtime-check-system"); echo "******************************* Update Complete *******************************".PHP_EOL; +*/ diff --git a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php index 1658143f6..f17716bf9 100644 --- a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php @@ -544,6 +544,12 @@ class AirtimeConfigFileUpgrade{ } } + private static function ChangeFileOwnerGroupMod($filename, $user){ + return (chown($filename, $user) && + chgrp($filename, $user) && + chmod($filename, 0640)); + } + }