CC-2604 : Config files not copied across updates from multiple versions, incorrect path.

This commit is contained in:
Naomi Aro 2011-07-27 14:59:10 +02:00
parent 1ef785a0fd
commit 66593cb1a1
2 changed files with 6 additions and 6 deletions

View file

@ -121,7 +121,7 @@ function CreateIniFiles()
} }
} }
if (!copy("airtime.conf.181", CONF_FILE_AIRTIME)){ if (!copy(__DIR__."/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);
} }
@ -162,8 +162,8 @@ function UpdateIniValue($p_filename, $p_property, $p_value)
foreach ($lines as &$line) { foreach ($lines as &$line) {
if ($line[0] != "#"){ if ($line[0] != "#"){
$key_value = split("=", $line); $key_value = split("=", $line);
$key = trim($key_value[0]); $key = trim($key_value[0]);
if ($key == $p_property){ if ($key == $p_property){
$line = "$p_property = $p_value".PHP_EOL; $line = "$p_property = $p_value".PHP_EOL;
} }

View file

@ -121,7 +121,7 @@ function CreateIniFiles()
} }
} }
if (!copy("airtime.conf.182", CONF_FILE_AIRTIME)){ if (!copy(__DIR__."/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);
} }
@ -162,8 +162,8 @@ function UpdateIniValue($p_filename, $p_property, $p_value)
foreach ($lines as &$line) { foreach ($lines as &$line) {
if ($line[0] != "#"){ if ($line[0] != "#"){
$key_value = split("=", $line); $key_value = split("=", $line);
$key = trim($key_value[0]); $key = trim($key_value[0]);
if ($key == $p_property){ if ($key == $p_property){
$line = "$p_property = $p_value".PHP_EOL; $line = "$p_property = $p_value".PHP_EOL;
} }