diff options
-rwxr-xr-x | emi | 19 | ||||
-rwxr-xr-x | ulri | 16 |
2 files changed, 21 insertions, 14 deletions
@@ -46,6 +46,17 @@ $run{LOG} = sub { print $LOG @_ }; my $HOME = $ENV{HOME}; my $configfile = "$HOME/.upload.conf"; +my $sysconfigfile = "/etc/iurt/upload.conf"; + +my $config = {}; +foreach my $f ($configfile, $sysconfigfile) { + plog('DEBUG', "load config: $f"); + if (-f $f) { + $config = eval(cat_($f)) + or die "FATAL $program_name: syntax error in $f"; + last; + } +} my %config_usage = ( admin => { @@ -94,14 +105,6 @@ my %config_usage = ( }, ); -my $config; -if (-f $configfile) { - $config = eval(cat_($configfile)) - or die "FATAL $program_name: syntax error in $configfile"; -} else { - $config = {}; -} - config_usage(\%config_usage, $config) if $run{config_usage}; config_init(\%config_usage, $config, \%run); @@ -55,12 +55,16 @@ plog_init($program_name, $LOG, 7, 1); my $HOME = $ENV{HOME}; my $configfile = "$HOME/.upload.conf"; - -my $config; -if (-f $configfile) { - $config = eval(cat_($configfile)) or die "FATAL $program_name: syntax error in $configfile"; -} else { - $config = {}; +my $sysconfigfile = "/etc/iurt/upload.conf"; + +my $config = {}; +foreach my $f ($configfile, $sysconfigfile) { + plog('DEBUG', "load config: $f"); + if (-f $f) { + $config = eval(cat_($f)) + or die "FATAL $program_name: syntax error in $f"; + last; + } } my %config_usage = ( |