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

CC-2579: Upgrad fails 1.8->1.9

Browse source 
- moved all the config files to each upgrade dir
- also fixed back up name of 1.9.0 conifg to 1.9.0(from 1.8.1)
This commit is contained in:
james 2011-07-22 15:32:10 -04:00
parent d1494c1735
commit a84cb7fc37
9 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
install_minimal/upgrades/airtime-1.7.0/airtime-upgrade.php
View file

@ -9,14 +9,12 @@
require_once(dirname(__FILE__).'/../../include/AirtimeIni.php'); require_once(dirname(__FILE__).'/../../include/AirtimeIni.php');
require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php'); require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php');
/** /**
* This function creates the /etc/airtime configuration folder * This function creates the /etc/airtime configuration folder
* and copies the default config files to it. * and copies the default config files to it.
*/ */
function CreateIniFiles() function CreateIniFiles()
{ {
global $AIRTIME_SRC;
global $AIRTIME_PYTHON_APPS; global $AIRTIME_PYTHON_APPS;
if (!file_exists("/etc/airtime/")){ if (!file_exists("/etc/airtime/")){
@ -26,7 +24,7 @@ function CreateIniFiles()
} }
} }
if (!copy($AIRTIME_SRC."/build/airtime.conf.170", CONF_FILE_AIRTIME)){ if (!copy("airtime.conf.170", CONF_FILE_AIRTIME)){
echo "Could not copy airtime.conf to /etc/airtime/. Exiting."; echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
exit(1); exit(1);
} }

0
airtime_mvc/build/airtime.conf.170 → install_minimal/upgrades/airtime-1.7.0/airtime.conf.170
View file

3
install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
View file

@ -59,7 +59,6 @@ foreach ($configFiles as $conf) {
*/ */
function CreateIniFiles() function CreateIniFiles()
{ {
global $AIRTIME_SRC;
global $AIRTIME_PYTHON_APPS; global $AIRTIME_PYTHON_APPS;
if (!file_exists("/etc/airtime/")){ if (!file_exists("/etc/airtime/")){
@ -69,7 +68,7 @@ function CreateIniFiles()
} }
} }
if (!copy($AIRTIME_SRC."/build/airtime.conf.180", CONF_FILE_AIRTIME)){ if (!copy("airtime.conf.180", CONF_FILE_AIRTIME)){
echo "Could not copy airtime.conf to /etc/airtime/. Exiting."; echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
exit(1); exit(1);
} }

0
airtime_mvc/build/airtime.conf.180 → install_minimal/upgrades/airtime-1.8.0/airtime.conf.180
View file

3
install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
View file

@ -112,7 +112,6 @@ function LoadConfig($CC_CONFIG) {
*/ */
function CreateIniFiles() function CreateIniFiles()
{ {
global $AIRTIME_SRC;
global $AIRTIME_PYTHON_APPS; global $AIRTIME_PYTHON_APPS;
if (!file_exists("/etc/airtime/")){ if (!file_exists("/etc/airtime/")){
@ -122,7 +121,7 @@ function CreateIniFiles()
} }
} }
if (!copy($AIRTIME_SRC."/build/airtime.conf.181", CONF_FILE_AIRTIME)){ if (!copy("airtime.conf.181", CONF_FILE_AIRTIME)){
echo "Could not copy airtime.conf to /etc/airtime/. Exiting."; echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
exit(1); exit(1);
} }

0
airtime_mvc/build/airtime.conf.181 → install_minimal/upgrades/airtime-1.8.1/airtime.conf.181
View file

3
install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
View file

@ -112,7 +112,6 @@ function LoadConfig($CC_CONFIG) {
*/ */
function CreateIniFiles() function CreateIniFiles()
{ {
global $AIRTIME_SRC;
global $AIRTIME_PYTHON_APPS; global $AIRTIME_PYTHON_APPS;
if (!file_exists("/etc/airtime/")){ if (!file_exists("/etc/airtime/")){
@ -122,7 +121,7 @@ function CreateIniFiles()
} }
} }
if (!copy($AIRTIME_SRC."/build/airtime.conf.182", CONF_FILE_AIRTIME)){ if (!copy("airtime.conf.182", CONF_FILE_AIRTIME)){
echo "Could not copy airtime.conf to /etc/airtime/. Exiting."; echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
exit(1); exit(1);
} }

0
airtime_mvc/build/airtime.conf.182 → install_minimal/upgrades/airtime-1.8.2/airtime.conf.182
View file

2
install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
View file

@ -462,7 +462,7 @@ class AirtimeIni{
AirtimeIni::CONF_FILE_LIQUIDSOAP); AirtimeIni::CONF_FILE_LIQUIDSOAP);
// Backup the config files // Backup the config files
$suffix = date("Ymdhis")."-1.8.1"; $suffix = date("Ymdhis")."-1.9.0";
foreach ($configFiles as $conf) { foreach ($configFiles as $conf) {
if (file_exists($conf)) { if (file_exists($conf)) {
echo "Backing up $conf to $conf$suffix.bak".PHP_EOL; echo "Backing up $conf to $conf$suffix.bak".PHP_EOL;