CC-2256 Airtime-upgrade.php does not upgrade the web app
trying to fix daemontools upgrade problems
This commit is contained in:
parent
5e2e3dbf05
commit
70355cc364
|
@ -46,12 +46,12 @@ if(strcmp($version, "1.8.2") < 0) {
|
||||||
|
|
||||||
AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION);
|
AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION);
|
||||||
|
|
||||||
echo PHP_EOL."*** Updating Pypo ***".PHP_EOL;
|
|
||||||
system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py");
|
|
||||||
|
|
||||||
echo PHP_EOL."*** Updating Recorder ***".PHP_EOL;
|
echo PHP_EOL."*** Updating Recorder ***".PHP_EOL;
|
||||||
system("python ".__DIR__."/../python_apps/show-recorder/install/recorder-install.py");
|
system("python ".__DIR__."/../python_apps/show-recorder/install/recorder-install.py");
|
||||||
|
|
||||||
|
echo PHP_EOL."*** Updating Pypo ***".PHP_EOL;
|
||||||
|
system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py");
|
||||||
|
|
||||||
echo "******************************* Update Complete *******************************".PHP_EOL;
|
echo "******************************* Update Complete *******************************".PHP_EOL;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -198,14 +198,14 @@ class AirTimeApiClient(ApiClientInterface):
|
||||||
return False
|
return False
|
||||||
elif (version[0:3] != AIRTIME_VERSION):
|
elif (version[0:3] != AIRTIME_VERSION):
|
||||||
if (verbose):
|
if (verbose):
|
||||||
print 'Airtime version: ' + str(version)
|
print 'Airtime version found: ' + str(version)
|
||||||
print 'pypo not compatible with this version of Airtime.'
|
print 'pypo is at version ' +AIRTIME_VERSION+' and is not compatible with this version of Airtime.'
|
||||||
print
|
print
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
if (verbose):
|
if (verbose):
|
||||||
print 'Airtime version: ' + str(version)
|
print 'Airtime version: ' + str(version)
|
||||||
print 'pypo is compatible with this version of Airtime.'
|
print 'pypo is at version ' +AIRTIME_VERSION+' and is compatible with this version of Airtime.'
|
||||||
print
|
print
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue