* Use Debbugs::Config and the new $gLibPath global

diff --git a/scripts/process.in b/scripts/process.in
index bdeec7f72609d990e10b20ebc5023ee95eb99819..43387b27ec4e74f95c134f369f960c1000fcb3d8 100755 (executable)
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -4,9 +4,7 @@
 # Usage: process nn
 # Temps:  incoming/Pnn
 
-use POSIX qw(strftime tzset);
-$ENV{"TZ"} = 'UTC';
-tzset();
+use POSIX qw(strftime);
 
 use MIME::Parser;
 use Debbugs::MIME qw(decode_rfc1522 create_mime_message);
@@ -14,14 +12,13 @@ use Debbugs::Mail qw(send_mail_message encode_headers);
 use Debbugs::Packages qw(getpkgsrc);
 use Debbugs::User qw(read_usertags write_usertags);
 
-my $config_path = '/etc/debbugs';
-my $lib_path = '/usr/lib/debbugs';
-
 # TODO DLA; needs config reworking and errorlib reworking
 # use warnings;
 # use strict;
 
-require "$config_path/config";
+use Debbugs::Config qw(:globals);
+my $lib_path = $gLibPath;
+
 require "$lib_path/errorlib";
 $ENV{'PATH'} = $lib_path.':'.$ENV{'PATH'};
 

diff --git a/scripts/processall.in b/scripts/processall.in
index 1d7496d1dcc03218f13289199be0751a7f3637be..263f2ee797c604634b5aaa8e162ee99bc13e9e3b 100755 (executable)
--- a/scripts/processall.in
+++ b/scripts/processall.in
@@ -8,10 +8,12 @@
 # Creates: incoming/E.nn
 # Stop:    stop
 
-$config_path = '/etc/debbugs';
-$lib_path = '/usr/lib/debbugs';
 
-require "$config_path/config";
+use Debbugs::Config qw(:globals);
+
+my $lib_path = $gLibPath;
+
+
 require "$lib_path/errorlib";
 $ENV{'PATH'} = $lib_path.':'.$ENV{'PATH'};
 

diff --git a/scripts/receive.in b/scripts/receive.in
index 815b6c80c649acdbfc7550a5deacc761d0e48c41..df602bbf036f0bbd0a1d04e470217eb967a068d7 100755 (executable)
--- a/scripts/receive.in
+++ b/scripts/receive.in
@@ -5,11 +5,9 @@
 #set umask in order to have group-writable incoming/*
 #umask(002);
 
-#load configuration file
-$config_path = '/etc/debbugs';
-#$lib_path = '/usr/lib/debbugs';
+use Debbugs::Config qw(:globals);
+my $lib_path = $gLibPath;
 
-require "$config_path/config";
 $ENV{'PATH'} = '/usr/lib/debbugs:'.$ENV{'PATH'};
 
 #set source of mail delivery

diff --git a/scripts/service.in b/scripts/service.in
index 1c03c273a2d4019a90ff419cd75c545e15ba4cae..4730b8bd5064c2c7647afc0044477f1328392775 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -10,10 +10,8 @@ use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522);
 use Debbugs::Mail qw(send_mail_message);
 use Debbugs::User;
 
-$config_path = '/etc/debbugs';
-$lib_path = '/usr/lib/debbugs';
-
-require "$config_path/config";
+use Debbugs::Config qw(:globals);
+$lib_path = $gLibPath;
 require "$lib_path/errorlib";
 $ENV{'PATH'} = $lib_path.':'.$ENV{'PATH'};