For whatever reason, just calling "do" on the tinder-config.pl script was not causing the defaults to be overriden, so we manually read & process tinder-config.pl as we did tinder-defaults.pl.

This commit is contained in:
cls%seawood.org 2000-06-27 12:21:46 +00:00
Родитель f6b2cdf685
Коммит a9f0fa27a5
1 изменённых файлов: 13 добавлений и 2 удалений

Просмотреть файл

@ -18,7 +18,7 @@ use POSIX qw(sys_wait_h strftime);
use Cwd;
use File::Basename; # for basename();
use Config; # for $Config{sig_name} and $Config{sig_num}
$::UtilsVersion = '$Revision: 1.21 $ ';
$::UtilsVersion = '$Revision: 1.22 $ ';
package TinderUtils;
@ -248,7 +248,18 @@ sub GetSystemInfo {
sub LoadConfig {
if (-r 'tinder-config.pl') {
{ package Settings; do 'tinder-config.pl'; }
no strict 'vars';
open CONFIG, 'tinder-config.pl' or
print "can't open tinder-config.pl, $?\n";
while (<CONFIG>) {
package Settings;
#warn "config:$_";
eval;
}
close CONFIG;
} else {
warn "Error: Need tinderbox config file, tinder-config.pl\n";
warn " To get started, run the following,\n";