INN commit: trunk (perl/INN/Config.pm.in scripts/innshellvars.pl.in)

[INN Commit]

    Date: Sunday, December 14, 2008 @ 10:09:21
  Author: iulius
Revision: 8233

Do the same thing as the shell version of innshellvars:
 * Sets umask.
 * New variable $home.
 * Export variables NEWSHOME, SPOOLDIR, MOST_LOGS, NEWSBIN, NEWSETC, NEWSLIB,
   INNDDIR, NEWSLBIN in the environment.

see #10

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

----------------------------+
 perl/INN/Config.pm.in      |   16 +++++++++-
 scripts/innshellvars.pl.in |   65 +++++++++++++++++++++++++------------------
 2 files changed, 54 insertions(+), 27 deletions(-)

Modified: perl/INN/Config.pm.in
===================================================================
--- perl/INN/Config.pm.in	2008-12-14 17:05:57 UTC (rev 8232)
+++ perl/INN/Config.pm.in	2008-12-14 18:09:21 UTC (rev 8233)
@@ -30,12 +30,13 @@
 
 
 ##  Paths of useful directories.
-my @DIRVAR = qw($prefix $exec_prefix $newshome $newslib
+my @DIRVAR = qw($prefix $exec_prefix $newshome $home $newslib
 $newsbin $controlprogs $newslbin $newsetc $spooldir
 $archivedir $spool $incoming $spoolnews $badnews
 $batch $overviewdir $most_logs $locks $innddir $tmpdir
 $spooltemp);
 our $newshome = $pathnews;
+our $home = $pathnews;
 our $newslib = "@libdir@";
 our $newsbin = $pathbin;
 our $controlprogs = $pathcontrol;
@@ -153,16 +154,29 @@
 my @PARAMVAR = qw($do_dbz_tagged_hash);
 our $do_dbz_tagged_hash = '@DO_DBZ_TAGGED_HASH@';
 
+
 ##  Set up some environment values.
 if ($ovmethod && $ovmethod eq "ovdb") {
     $ENV{'DB_HOME'} = $pathoverview;
 }
 $ENV{'HOME'} = ${pathnews};
+$ENV{'INNDDIR'} = $innddir;
+$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{'SPOOLDIR'} = $spooldir;
 $ENV{'TMPDIR'} = $pathtmp;
 
 
+##  Set up umask.
+umask @NEWSUMASK@;
+
+
 ##  This array will contain what it is possible to export.
 our @EXPORT_OK = (@INNCONFVAR, @DIRVAR, @FILESVAR, @PROGVAR,
 @LOCKVAR, @EXTPROGVAR, @EXTCOMPVAR, @SYSVAR, @PARAMVAR);

Modified: scripts/innshellvars.pl.in
===================================================================
--- scripts/innshellvars.pl.in	2008-12-14 17:05:57 UTC (rev 8232)
+++ scripts/innshellvars.pl.in	2008-12-14 18:09:21 UTC (rev 8233)
@@ -8,7 +8,7 @@
 # File:         innshellvars.pl
 # RCSId:        $Id$
 # Description:  Set up any and all variables that an INN perl script
-#               might need.
+#               might need.  Also sets umask.
 #
 
 package inn ;
@@ -18,27 +18,33 @@
 eval `@bindir@/innconfval -p`;
 
 $newshome = $pathnews;
-$newslib = "@libdir@";
 $spooldir = $pathspool;
 $most_logs = $pathlog;
+$ENV{'NEWSHOME'} = $pathnews;
+$ENV{'SPOOLDIR'} = $spooldir;
+$ENV{'MOST_LOGS'} = $most_logs;
 
-$errlog = "${most_logs}/errlog" ;
-$log = "${most_logs}/news" ;
+$newsbin = $pathbin;
+$newsetc = $pathetc;
+$newslib = "@libdir@";
+$innddir = $pathrun;
+$locks = $pathrun;
+$ENV{'NEWSBIN'} = $newsbin;
+$ENV{'NEWSETC'} = $newsetc;
+$ENV{'NEWSLIB'} = $newslib;
+$ENV{'INNDDIR'} = $innddir;
 
+$errlog = "${most_logs}/errlog";
+$log = "${most_logs}/news";
+
+$archivedir = $patharchive;
 $spool = $patharticles;
+$batch = $pathoutgoing;
+$incoming = $pathincoming;
 $overviewdir = $pathoverview;
-$archivedir = $patharchive;
+$spoolnews = $pathincoming;
 $badnews = "$pathincoming/bad";
-$spoolnews = $pathincoming;
-$batch = $pathoutgoing;
-$incoming = $pathincoming;
 
-$locks = $pathrun;
-$newsbin = $pathbin;
-$innddir = $pathrun;
-$newsetc = $pathetc;
-$newslbin = "$pathnews/local";
-
 $active = "${pathdb}/active" ;
 $activetimes = "${pathdb}/active.times" ;
 $ctlfile = "${newsetc}/control.ctl" ;
@@ -49,14 +55,14 @@
 $newsgroups = "${pathdb}/newsgroups" ;
 $oldactive = "${pathdb}/active.old" ;
 $path_motd = "${newsetc}/motd.news" ;
+$expirectl = "${newsetc}/expire.ctl" ;
 $localgroups = "$newsetc/localgroups" ;
-$expirectl = "${newsetc}/expire.ctl" ;
 
 $controlprogs = $pathcontrol;
-$inews = "${newsbin}/inews" ;
 $innconfval = "${newsbin}/innconfval" ;
 $innd = "${newsbin}/innd" ;
 $innwatch = "${newsbin}/innwatch" ;
+$inews = "${newsbin}/inews" ;
 $rnews = "${newsbin}/rnews" ;
 $perl_startup_innd = "$pathfilter/startup_innd.pl" ;
 $perl_filter_innd = "$pathfilter/filter_innd.pl" ;
@@ -78,8 +84,8 @@
 $sed = '@SED@' ;
 $inndf = "${newsbin}/inndf" ;
 $egrep = '@EGREP@' ;
+$perl = '@PERL@' ;
 $gpgv = '@GPGV@' ;
-$perl = '@PERL@' ;
 $pgp = '@PGP@' ;
 $sort = '@SORT@' ;
 $getftp = '@PATH_GETFTP@' ;
@@ -104,23 +110,30 @@
 $newsuser = ${runasuser} ;
 $newsgroup = ${runasgroup} ;
 
-$do_dbz_tagged_hash = '@DO_DBZ_TAGGED_HASH@' ;
+$filemode = @FILEMODE@;
+$inewsmode = @INEWSMODE@;
+$rnewsmode = @RNEWSMODE@;
 
-$ENV{'TMPDIR'} = $pathtmp;
-$tmpdir = $pathtmp;
-$spooltemp = $pathtmp;
+$do_dbz_tagged_hash = '@DO_DBZ_TAGGED_HASH@';
 
-$filemode = @FILEMODE@ ;
-$inewsmode = @INEWSMODE@ ;
-$rnewsmode = @RNEWSMODE@ ;
-$umask = @NEWSUMASK@ ;
+$tmpdir = ${pathtmp};
+$ENV{'TMPDIR'} = ${pathtmp};
 
+$spooltemp = ${pathtmp};
+
+$newslbin = "${newshome}/local";
+$ENV{'NEWSLBIN'} = ${newslbin};
+
+umask @NEWSUMASK@;
+$umask = @NEWSUMASK@;
+
 $syslog_facility = lc("@SYSLOG_FACILITY@");
 $syslog_facility =~ s/log_//;
 
 $ENV{'PATH'} ||= '';
-$ENV{'PATH'} = "${newslbin}:${newsbin}:$ENV{'PATH'}:/bin:/usr/bin" ;
+$ENV{'PATH'} = "${newslbin}:${newsbin}:$ENV{'PATH'}:/bin:/usr/bin";
 
+$home = ${pathnews};
 $ENV{'HOME'} = ${pathnews};
 
 1 ;