CC-2819: Upgrade from 1.8.2 to 1.9.4-RC2 fails on Debian squeeze with 'Failed sql query'
-initial commit
This commit is contained in:
parent
da5e57eaab
commit
ed199efeed
|
@ -61,8 +61,8 @@ echo -e "\n*** Creating Pypo User ***"
|
|||
python ${SCRIPTPATH}/../python_apps/create-pypo-user.py
|
||||
|
||||
set +e
|
||||
php ${SCRIPTPATH}/include/airtime-install.php $@
|
||||
$result=$?
|
||||
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
|
||||
exit 0
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -51,29 +51,31 @@ echo "******************************** Update Begin ****************************
|
|||
//convert strings like 1.9.0-devel to 1.9.0
|
||||
$version = substr($version, 0, 5);
|
||||
|
||||
$SCRIPTPATH = __DIR__;
|
||||
|
||||
if (strcmp($version, "1.7.0") < 0){
|
||||
system("php ".__DIR__."/../upgrades/airtime-1.7.0/airtime-upgrade.php");
|
||||
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.7.0/airtime-upgrade.php");
|
||||
}
|
||||
if (strcmp($version, "1.8.0") < 0){
|
||||
system("php ".__DIR__."/../upgrades/airtime-1.8.0/airtime-upgrade.php");
|
||||
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.8.0/airtime-upgrade.php");
|
||||
}
|
||||
if (strcmp($version, "1.8.1") < 0){
|
||||
system("php ".__DIR__."/../upgrades/airtime-1.8.1/airtime-upgrade.php");
|
||||
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.8.1/airtime-upgrade.php");
|
||||
}
|
||||
if (strcmp($version, "1.8.2") < 0){
|
||||
system("php ".__DIR__."/../upgrades/airtime-1.8.2/airtime-upgrade.php");
|
||||
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.8.2/airtime-upgrade.php");
|
||||
}
|
||||
if (strcmp($version, "1.9.0") < 0){
|
||||
system("php ".__DIR__."/../upgrades/airtime-1.9.0/airtime-upgrade.php");
|
||||
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.9.0/airtime-upgrade.php");
|
||||
}
|
||||
if (strcmp($version, "1.9.2") < 0){
|
||||
system("php ".__DIR__."/../upgrades/airtime-1.9.2/airtime-upgrade.php");
|
||||
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.9.2/airtime-upgrade.php");
|
||||
}
|
||||
if (strcmp($version, "1.9.3") < 0){
|
||||
system("php ".__DIR__."/../upgrades/airtime-1.9.3/airtime-upgrade.php");
|
||||
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.9.3/airtime-upgrade.php");
|
||||
}
|
||||
if (strcmp($version, "1.9.4") < 0){
|
||||
system("php ".__DIR__."/../upgrades/airtime-1.9.4/airtime-upgrade.php");
|
||||
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.9.4/airtime-upgrade.php");
|
||||
}
|
||||
|
||||
//set the new version in the database.
|
||||
|
@ -85,16 +87,16 @@ $sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '$newVers
|
|||
$CC_DBC->query($sql);
|
||||
|
||||
echo PHP_EOL."*** Updating Api Client ***".PHP_EOL;
|
||||
passthru("python ".__DIR__."/../../python_apps/api_clients/install/api_client_install.py");
|
||||
passthru("python $SCRIPTPATH/../../python_apps/api_clients/install/api_client_install.py");
|
||||
|
||||
echo PHP_EOL."*** Updating Pypo ***".PHP_EOL;
|
||||
passthru("python ".__DIR__."/../../python_apps/pypo/install/pypo-install.py");
|
||||
passthru("python $SCRIPTPATH/../../python_apps/pypo/install/pypo-install.py");
|
||||
|
||||
echo PHP_EOL."*** Updating Recorder ***".PHP_EOL;
|
||||
passthru("python ".__DIR__."/../../python_apps/show-recorder/install/recorder-install.py");
|
||||
passthru("python $SCRIPTPATH/../../python_apps/show-recorder/install/recorder-install.py");
|
||||
|
||||
echo PHP_EOL."*** Updating Media Monitor ***".PHP_EOL;
|
||||
passthru("python ".__DIR__."/../../python_apps/media-monitor/install/media-monitor-install.py");
|
||||
passthru("python $SCRIPTPATH/../../python_apps/media-monitor/install/media-monitor-install.py");
|
||||
|
||||
sleep(4);
|
||||
passthru("airtime-check-system");
|
||||
|
|
|
@ -83,21 +83,25 @@ class AirtimeInstall{
|
|||
public static function BypassMigrations($dir, $version)
|
||||
{
|
||||
$appDir = AirtimeInstall::GetAirtimeSrcDir();
|
||||
$command = "php $appDir/library/doctrine/migrations/doctrine-migrations.phar ".
|
||||
$SCRIPTPATH = __DIR__;
|
||||
$command = "php --php-ini $SCRIPTPATH/../../airtime-php.ini ".
|
||||
"$appDir/library/doctrine/migrations/doctrine-migrations.phar ".
|
||||
"--configuration=$dir/../../DoctrineMigrations/migrations.xml ".
|
||||
"--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ".
|
||||
"--no-interaction --add migrations:version $version";
|
||||
system($command);
|
||||
passthru($command);
|
||||
}
|
||||
|
||||
public static function MigrateTablesToVersion($dir, $version)
|
||||
{
|
||||
$appDir = AirtimeInstall::GetAirtimeSrcDir();
|
||||
$command = "php $appDir/library/doctrine/migrations/doctrine-migrations.phar ".
|
||||
$SCRIPTPATH = __DIR__;
|
||||
$command = "php --php-ini $SCRIPTPATH/../../airtime-php.ini ".
|
||||
"$appDir/library/doctrine/migrations/doctrine-migrations.phar ".
|
||||
"--configuration=$dir/../../DoctrineMigrations/migrations.xml ".
|
||||
"--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ".
|
||||
"--no-interaction migrations:migrate $version";
|
||||
system($command);
|
||||
passthru($command);
|
||||
}
|
||||
|
||||
public static function CreateCronFile(){
|
||||
|
|
Loading…
Reference in New Issue