linux/wreq/no-scriptdir.diff

   1 Index: req-config
   2 ===================================================================
   3 RCS file: /cvsroot/its/sw/wreq/req-config,v
   4 retrieving revision 1.2
   5 retrieving revision 1.3
   6 diff -u -w -u -r1.2 -r1.3
   7 --- req-config  1999/05/10 08:49:43     1.2
   8 +++ req-config  1999/05/15 10:20:04     1.3
   9 @@ -8,10 +8,6 @@
  10  #### The default location is "*/cgi-bin/wreq/data":
  11  $top='../../data/wreq';
  12
  13 -#### Directory name where all the req* scripts live:
  14 -#### No need to change if $top above has not been changed.
  15 -$scriptdir='..';
  16 -
  17  #### How to call sendmail on your system
  18  $sendmail="/usr/lib/sendmail -oi"; # will -db make the page faster to return?
  19
  20 Index: req-mail
  21 ===================================================================
  22 RCS file: /cvsroot/its/sw/wreq/req-mail,v
  23 retrieving revision 1.2
  24 retrieving revision 1.3
  25 diff -u -w -u -r1.2 -r1.3
  26 --- req-mail    1999/05/10 08:49:43     1.2
  27 +++ req-mail    1999/05/15 10:22:44     1.3
  28 @@ -7,9 +7,13 @@
  29
  30  ### load in the following global config params:
  31  ### $wreq_host $wreq_port $wreq_url $error_cc $error_from
  32 -#require 'req-config';
  33 -$rcf=$0; $rcf=~s/\-mail$/\-config/;
  34 -require "$rcf";
  35 +
  36 +# Add 'pwd' to include path
  37 +@F = split('/', $0); pop @F;
  38 +push (@INC,join ('/', @F));
  39 +
  40 +require 'req-config';
  41 +
  42  if(-f "$rcf-duke"){# hack to get our web server
  43         $wreq_host='caesar';
  44  }
  45 Index: req
  46 ===================================================================
  47 RCS file: /cvsroot/its/sw/wreq/req,v
  48 retrieving revision 1.2
  49 retrieving revision 1.3
  50 diff -u -w -u -r1.2 -r1.3
  51 --- req 1999/05/10 08:49:43     1.2
  52 +++ req 1999/05/15 10:19:27     1.3
  53 @@ -110,7 +110,6 @@
  54  #      $rhost $raddr   browser's hostname and IP number
  55  #      %DBM OUT IN LOCK        gdbm hash, output/input/lock filehandle
  56  #      $top    top dir of the req data
  57 -#      $scriptdir      absolute dir name where all the req* scripts reside
  58  #
  59  # gmtime:
  60  #      0sec(0-61) 1min(0-59) 2hour(0-23) 3mday(1-31) 4mon(0-11) 5year(+1900)
  61 @@ -151,8 +150,11 @@
  62  #      Make all email address case insentive
  63  #
  64  ####################################################################
  65 +# Add 'pwd' to include path
  66 +@F = split('/', $0); pop @F;
  67 +push (@INC,join ('/', @F));
  68  # load in global config params
  69 -require "$0-config";
  70 +require "req-config";
  71  ####################################################################
  72  $url="$ENV{'SCRIPT_NAME'}";
  73  $server="$ENV{'SERVER_NAME'}";# set in server's conf file
  74 @@ -173,7 +175,6 @@
  75         &html_error("Error, the req directory \"$top\" doesn't exist.");
  76  }
  77  chdir $top || &html_error("Error, can't cd to top.");
  78 -push @INC,$scriptdir; # `pwd` doesn't work here, since perl is interpreted
  79  umask 022;
  80
  81  $oldauth=$auth=$warn='';