From 058c2318e7e0acf33bebe7d15b6a160ca487352a Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Wed, 3 Aug 2011 16:00:04 +0200 Subject: [PATCH] CC-2621 : Support upgrades from 1.7.0 --- .../upgrades/airtime-1.8.0/airtime-upgrade.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php index b98086956..94a6673e8 100644 --- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php @@ -9,7 +9,7 @@ set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path()); //require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php'; require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php'); -require_once(dirname(__FILE__).'/../../include/AirtimeIni.php'); +//require_once(dirname(__FILE__).'/../../include/AirtimeIni.php'); global $CC_CONFIG; @@ -90,10 +90,10 @@ const CONF_FILE_PYPO = "/etc/airtime/pypo.cfg"; const CONF_FILE_RECORDER = "/etc/airtime/recorder.cfg"; const CONF_FILE_LIQUIDSOAP = "/etc/airtime/liquidsoap.cfg"; -$configFiles = array(AirtimeIni::CONF_FILE_AIRTIME, - AirtimeIni::CONF_FILE_PYPO, - AirtimeIni::CONF_FILE_RECORDER, - AirtimeIni::CONF_FILE_LIQUIDSOAP); +$configFiles = array(CONF_FILE_AIRTIME, + CONF_FILE_PYPO, + CONF_FILE_RECORDER, + CONF_FILE_LIQUIDSOAP); /** @@ -180,6 +180,14 @@ function MergeConfigFiles($configFiles, $suffix) $oldSettings = ReadPythonConfig("$conf$suffix.bak"); } + //override some values needed for 1.8.0. + if($conf === CONF_FILE_PYPO) { + + $oldSettings['cache_dir'] = '/var/tmp/airtime/pypo/cache/' + $oldSettings['file_dir'] = '/var/tmp/airtime/pypo/files/' + $oldSettings['tmp_dir'] = '/var/tmp/airtime/pypo/tmp/' + } + $settings = array_keys($newSettings); foreach($settings as $section) {