CC-2824: deb 1.7 upgrade to 1.9.4. /usr/share/airtime folder is empty

This commit is contained in:
martin 2011-09-15 14:08:13 -04:00
parent 9c724913f4
commit 2128867b4f
1 changed files with 13 additions and 5 deletions

View File

@ -172,6 +172,9 @@ function MergeConfigFiles($configFiles, $suffix)
// Parse with sections
$newSettings = parse_ini_file($conf, true);
$oldSettings = parse_ini_file("$conf$suffix.bak", true);
$oldSettings['general']['airtime_dir'] = '/var/www/airtime';
$oldSettings['general']['base_files_dir'] = '/srv/airtime';
}
else {
$newSettings = ReadPythonConfig($conf);
@ -239,9 +242,10 @@ function LoadConfig($CC_CONFIG) {
}
function movePhpFiles($CC_CONFIG){
$baseDir = $CC_CONFIG['baseFilesDir'];
echo "Copying Server files from $baseDir/airtime_mvc to /var/www";
exec("cp -R $baseDir/airtime_mvc/* /var/www");
$phpDir = $CC_CONFIG['phpDir'];
echo "Copying Server files from $phpDir/airtime_mvc to /var/www/airtime";
exec("mkdir -p /var/www/airtime");
exec("cp -R $phpDir/airtime_mvc/* /var/www/airtime");
}
// Backup the config files
@ -253,12 +257,16 @@ foreach ($configFiles as $conf) {
}
}
$CC_CONFIG = LoadConfig($CC_CONFIG);
movePhpFiles($CC_CONFIG);
$default_suffix = "180";
CreateIniFiles($default_suffix);
echo "* Initializing INI files".PHP_EOL;
MergeConfigFiles($configFiles, $suffix);
$CC_CONFIG = LoadConfig($CC_CONFIG);
movePhpFiles($CC_CONFIG);