mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-20 17:58:07 +02:00
Some whitespace changes
This commit is contained in:
parent
e4bcc12301
commit
4c2f12e645
@ -3811,6 +3811,7 @@ sub update_config_file( $ ) {
|
|||||||
|
|
||||||
if ( -f $fn ) {
|
if ( -f $fn ) {
|
||||||
my ( $template, $output );
|
my ( $template, $output );
|
||||||
|
|
||||||
open $template, '<' , $fn or fatal_error "Unable to open $fn: $!";
|
open $template, '<' , $fn or fatal_error "Unable to open $fn: $!";
|
||||||
|
|
||||||
unless ( open $output, '>', "$configfile.updated" ) {
|
unless ( open $output, '>', "$configfile.updated" ) {
|
||||||
@ -3841,14 +3842,14 @@ sub update_config_file( $ ) {
|
|||||||
$val = $default;
|
$val = $default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
unless ( $val =~ /^[-\w\/\.]*$/ ) {
|
unless ( $val =~ /^[-\w\/\.]*$/ ) {
|
||||||
#
|
#
|
||||||
# Funny characters (including whitespace) -- use double quotes unless the thing is single-quoted
|
# Funny characters (including whitespace) -- use double quotes unless the thing is single-quoted
|
||||||
#
|
#
|
||||||
$val = qq("$val") unless $val =~ /^'.+'$/;
|
$val = qq("$val") unless $val =~ /^'.+'$/;
|
||||||
}
|
}
|
||||||
|
|
||||||
$_ = "$var=$val\n";
|
$_ = "$var=$val\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3907,7 +3908,6 @@ EOF
|
|||||||
fatal_error "Can't rename $configfile to $configfile.bak: $!" unless rename $configfile, "$configfile.bak";
|
fatal_error "Can't rename $configfile to $configfile.bak: $!" unless rename $configfile, "$configfile.bak";
|
||||||
fatal_error "Can't rename $configfile.updated to $configfile: $!" unless rename "$configfile.updated", $configfile;
|
fatal_error "Can't rename $configfile.updated to $configfile: $!" unless rename "$configfile.updated", $configfile;
|
||||||
|
|
||||||
|
|
||||||
progress_message3 "Configuration file $configfile updated - old file renamed $configfile.bak";
|
progress_message3 "Configuration file $configfile updated - old file renamed $configfile.bak";
|
||||||
} else {
|
} else {
|
||||||
fatal_error "$fn does not exist";
|
fatal_error "$fn does not exist";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user