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

removed a usless check. added the project's first type annotations

This commit is contained in:
Rudi Grinberg 2012-08-22 12:24:41 -04:00
parent 37b7ec3e14
commit 8e8f1b9a58
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php
View File

@ -127,7 +127,7 @@ class UpgradeCommon{
"../etc/api_client.cfg" => self::CONF_FILE_API_CLIENT "../etc/api_client.cfg" => self::CONF_FILE_API_CLIENT
); );
echo "Copying configs:"; echo "Copying configs:\n";
foreach ($config_copy as $path_part => $destination) { foreach ($config_copy as $path_part => $destination) {
$full_path = OsPath::normpath(OsPath::join(__DIR__, $full_path = OsPath::normpath(OsPath::join(__DIR__,
"$path_part.$suffix")); "$path_part.$suffix"));
@ -139,13 +139,8 @@ class UpgradeCommon{
} }
} }
private static function MergeConfigFiles($configFiles, $suffix) { private static function MergeConfigFiles(array $configFiles, $suffix) {
foreach ($configFiles as $conf) { foreach ($configFiles as $conf) {
// we want to use new liquidsoap.cfg so don't merge
// also for monit
if( $conf == self::CONF_FILE_LIQUIDSOAP){
continue;
}
if (file_exists("$conf$suffix.bak")) { if (file_exists("$conf$suffix.bak")) {
if($conf === self::CONF_FILE_AIRTIME) { if($conf === self::CONF_FILE_AIRTIME) {