CC-2806: Create upgrade template file
-missing function -comment out redundant code
This commit is contained in:
parent
421f543f99
commit
d93a9edcd2
|
@ -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
|
||||
|
|
|
@ -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){
|
||||
|
|
|
@ -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;
|
||||
*/
|
||||
|
|
|
@ -544,6 +544,12 @@ class AirtimeConfigFileUpgrade{
|
|||
}
|
||||
}
|
||||
|
||||
private static function ChangeFileOwnerGroupMod($filename, $user){
|
||||
return (chown($filename, $user) &&
|
||||
chgrp($filename, $user) &&
|
||||
chmod($filename, 0640));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue