INN commit: trunk (3 files)

[INN Commit]

    Date: Sunday, December 14, 2008 @ 10:34:07
  Author: iulius
Revision: 8237

Add $path and $locks variables.

see #10

Modified:
  trunk/perl/INN/Config.pm.in
  trunk/scripts/innshellvars.pl.in
  trunk/scripts/innshellvars.tcl.in

-----------------------------+
 perl/INN/Config.pm.in       |    9 +++++----
 scripts/innshellvars.pl.in  |    6 ++++--
 scripts/innshellvars.tcl.in |    1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

Modified: perl/INN/Config.pm.in
===================================================================
--- perl/INN/Config.pm.in	2008-12-14 18:18:18 UTC (rev 8236)
+++ perl/INN/Config.pm.in	2008-12-14 18:34:07 UTC (rev 8237)
@@ -34,7 +34,7 @@
 $newsbin $controlprogs $newslbin $newsetc $spooldir
 $archivedir $spool $incoming $spoolnews $badnews
 $batch $overviewdir $most_logs $locks $innddir $tmpdir
-$spooltemp);
+$spooltemp $path);
 our $newshome = $pathnews;
 our $home = $pathnews;
 our $newslib = "@libdir@";
@@ -55,8 +55,9 @@
 our $innddir = $pathrun;
 our $tmpdir = $pathtmp;
 our $spooltemp = $pathtmp;
+our $path = $ENV{'PATH'} || '';
+$path = "${newslbin}:${newsbin}:${path}:/bin:/usr/bin";
 
-
 ##  Paths of useful files.
 my @FILESVAR = qw($active $activetimes $newactive $oldactive
 $history $newsgroups $ctlfile $ctlwatch $localgroups
@@ -161,14 +162,14 @@
 }
 $ENV{'HOME'} = ${pathnews};
 $ENV{'INNDDIR'} = $innddir;
+$ENV{'LOCKS'} = $locks;
 $ENV{'MOST_LOGS'} = $most_logs;
 $ENV{'NEWSBIN'} = $newsbin;
 $ENV{'NEWSETC'} = $newsetc;
 $ENV{'NEWSHOME'} = $pathnews;
 $ENV{'NEWSLBIN'} = ${newslbin};
 $ENV{'NEWSLIB'} = $newslib;
-$ENV{'PATH'} ||= '';
-$ENV{'PATH'} = "${newslbin}:${newsbin}:$ENV{'PATH'}:/bin:/usr/bin";
+$ENV{'PATH'} = $path;
 $ENV{'SPOOLDIR'} = $spooldir;
 $ENV{'TMPDIR'} = $pathtmp;
 

Modified: scripts/innshellvars.pl.in
===================================================================
--- scripts/innshellvars.pl.in	2008-12-14 18:18:18 UTC (rev 8236)
+++ scripts/innshellvars.pl.in	2008-12-14 18:34:07 UTC (rev 8237)
@@ -33,6 +33,7 @@
 $ENV{'NEWSETC'} = $newsetc;
 $ENV{'NEWSLIB'} = $newslib;
 $ENV{'INNDDIR'} = $innddir;
+$ENV{'LOCKS'} = $locks;
 
 $errlog = "${most_logs}/errlog";
 $log = "${most_logs}/news";
@@ -130,8 +131,9 @@
 $syslog_facility = lc("@SYSLOG_FACILITY@");
 $syslog_facility =~ s/log_//;
 
-$ENV{'PATH'} ||= '';
-$ENV{'PATH'} = "${newslbin}:${newsbin}:$ENV{'PATH'}:/bin:/usr/bin";
+$path = $ENV{'PATH'} || '';
+$path = "${newslbin}:${newsbin}:${path}:/bin:/usr/bin";
+$ENV{'PATH'} = $path;
 
 $home = ${pathnews};
 $ENV{'HOME'} = ${pathnews};

Modified: scripts/innshellvars.tcl.in
===================================================================
--- scripts/innshellvars.tcl.in	2008-12-14 18:18:18 UTC (rev 8236)
+++ scripts/innshellvars.tcl.in	2008-12-14 18:34:07 UTC (rev 8237)
@@ -28,6 +28,7 @@
 set env(NEWSETC) "$inn_newsetc"
 set env(NEWSLIB) "$inn_newslib"
 set env(INNDDIR) "$inn_innddir"
+set env(LOCKS) "$inn_locks"
 
 set inn_errlog "${inn_most_logs}/errlog"
 set inn_log "${inn_most_logs}/news"