[project @ 2001-08-16 17:43:45 by doogie]

Add $config_path and $lib_path at the top, and modify the code to use these
vars, instead of hard-coding the paths.

diff --git a/scripts/db2html.in b/scripts/db2html.in
index 8e21a52a2731cbef0aa2a1d3069a6ae248e50970..2f849f48d8259efbf0e5d17e64ab01e1e98d3980 100755 (executable)
--- a/scripts/db2html.in
+++ b/scripts/db2html.in
@@ -1,12 +1,15 @@
 #!/usr/bin/perl
-# $Id: db2html.in,v 1.6 2000/10/07 17:27:13 joy Exp $
+# $Id: db2html.in,v 1.7 2001/08/16 17:47:31 doogie Exp $
 # usage: db2html [-diff] [-stampfile=<stampfile>] [-lastrun=<days>] <wwwbase>
 
 #load the necessary libraries/configuration
-require('/etc/debbugs/config');
-require('/etc/debbugs/text');
-require('/usr/lib/debbugs/errorlib');
-$ENV{'PATH'} = '/usr/lib/debbugs:'.$ENV{'PATH'};
+$config_path = '/org/bugs.debian.org/etc';
+$lib_path = '/org/bugs.debian.org/scripts';
+
+require("$config_path/config");
+require("$config_path/text");
+require("$lib_path/errorlib");
+$ENV{'PATH'} = $lib_path.':'.$ENV{'PATH'};
 
 #set current working directory
 chdir("$gSpoolDir") || die "chdir spool: $!\n";

diff --git a/scripts/html-control.in b/scripts/html-control.in
index dafd69e3af8cf561265648d5ab89fdc305db7a4d..ff53dc4318c84448d6db2b8d44f61918599bcce8 100755 (executable)
--- a/scripts/html-control.in
+++ b/scripts/html-control.in
@@ -1,13 +1,17 @@
 #!/usr/bin/perl
-# $Id: html-control.in,v 1.6 2001/01/27 22:09:01 joy Exp $
+# $Id: html-control.in,v 1.7 2001/08/16 17:43:45 doogie Exp $
 
 use POSIX;
 
-require '/etc/debbugs/config';
-require '/usr/lib/debbugs/errorlib';
-$ENV{'PATH'} = '/usr/lib/debbugs:'.$ENV{'PATH'};
+$config_path = '/org/bugs.debian.org/etc';
+$lib_path = '/org/bugs.debian.org/scripts';
+
+require("$config_path/config");
+require("$lib_path/errorlib");
+$ENV{'PATH'} = $lib_path.':'.$ENV{'PATH'};
+
 chdir("$gSpoolDir") || die "chdir spool: $!\n";
-#push(@INC,'/usr/lib/debbugs');
+#push(@INC,"$lib_path");
 
 &filelock("html.fcntl-lock");
 
@@ -74,9 +78,9 @@ END
 }
 close(MM) or nonawful("close html-data.mail: $!");
 
-runshell("/usr/lib/debbugs/db2html $args 2>&1 >html-data $gWebDir/db",
+runshell("$lib_path/db2html $args 2>&1 >html-data $gWebDir/db",
          sub { &nonawful; });
-runshell("/usr/lib/debbugs/html-install $gWebDir/db <html-data 2>&1",sub { &quit; });
+runshell("$lib_path/html-install $gWebDir/db <html-data 2>&1",sub { &quit; });
 #runshell("gzip -9 html-data 2>&1",sub { &quit; });
 #runshell("btoa 2>&1 <html-data.gz >>html-data.mail",sub { &quit; });
 #runshell('2>&1 '.join(' ',('/usr/lib/sendmail','-f'."$gMaintainerEmail")).' -oem -oi -t <html-data.mail',

diff --git a/scripts/html-install.in b/scripts/html-install.in
index e699b0439887443401776ab9c7297fb8015b7724..6d5d98920ec4bc6f905b1ce99eed284f392cd345 100755 (executable)
--- a/scripts/html-install.in
+++ b/scripts/html-install.in
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
-# $Id: html-install.in,v 1.2 1999/09/02 22:27:29 gecko Exp $
+# $Id: html-install.in,v 1.3 2001/08/16 17:46:00 doogie Exp $
 # Takes 1 argument - directory tree to install into
 # Tree _must_ be synch'd with one used by db2html to generate file
 
 use POSIX;
-require( '/etc/debbugs/config' );
+$config_path = '/org/bugs.debian.org/etc';
+
+require("$config_path/config");
+$ENV{'PATH'} = $lib_path.':'.$ENV{'PATH'};
 
 $dirtree= shift(@ARGV);
 defined($dirtree) or die 'usage';