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

CC-2271 1.8.2 code cleanup tasks

Browse source 
changing 1.8.1 upgrade script to using raw source first.
This commit is contained in:
Naomi 2011-05-18 14:22:45 -04:00
parent d6616004a6
commit b84854c13c
15 changed files with 230 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

21
install/include/AirtimeIni.php
View file

@ -26,15 +26,14 @@ class AirtimeIni
const CONF_FILE_PYPO = "/etc/airtime/pypo.cfg";
const CONF_FILE_RECORDER = "/etc/airtime/recorder.cfg";
const CONF_FILE_LIQUIDSOAP = "/etc/airtime/liquidsoap.cfg";
const CONF_FILE_MEDIAMONITOR = "/etc/airtime/MediaMonitor.cfg";
//const CONF_FILE_MEDIAMONITOR = "/etc/airtime/MediaMonitor.cfg";
public static function IniFilesExist()
{
$configFiles = array(AirtimeIni::CONF_FILE_AIRTIME,
AirtimeIni::CONF_FILE_PYPO,
AirtimeIni::CONF_FILE_RECORDER,
AirtimeIni::CONF_FILE_LIQUIDSOAP,
AirtimeIni::CONF_FILE_MEDIAMONITOR);
AirtimeIni::CONF_FILE_LIQUIDSOAP);
$exist = false;
foreach ($configFiles as $conf) {
if (file_exists($conf)) {
@ -74,10 +73,11 @@ class AirtimeIni
echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting.";
exit(1);
}
if (!copy(__DIR__."/../../python_apps/pytag-fs/MediaMonitor.cfg", AirtimeIni::CONF_FILE_MEDIAMONITOR)){
echo "Could not copy MediaMonitor.cfg to /etc/airtime/. Exiting.";
exit(1);
}
//wait until Airtime 1.9.0
//if (!copy(__DIR__."/../../python_apps/pytag-fs/MediaMonitor.cfg", AirtimeIni::CONF_FILE_MEDIAMONITOR)){
// echo "Could not copy MediaMonitor.cfg to /etc/airtime/. Exiting.";
// exit(1);
//}
}
/**
@ -102,9 +102,10 @@ class AirtimeIni
unlink(AirtimeIni::CONF_FILE_LIQUIDSOAP);
}
if (file_exists(AirtimeIni::CONF_FILE_MEDIAMONITOR)){
unlink(AirtimeIni::CONF_FILE_MEDIAMONITOR);
}
//wait until Airtime 1.9.0
//if (file_exists(AirtimeIni::CONF_FILE_MEDIAMONITOR)){
// unlink(AirtimeIni::CONF_FILE_MEDIAMONITOR);
//}
if (file_exists("etc/airtime")){
rmdir("/etc/airtime/");