svn commit: r638800 - /spamassassin/trunk/masses/rule-qa/nightly-slave-start

[jm...@apache.org]

Author: jm
Date: Wed Mar 19 04:49:04 2008
New Revision: 638800

URL: http://svn.apache.org/viewvc?rev=638800&view=rev
Log:
use ~/envs on the nightly mass-check slave accounts, so that custom perls can be used instead of /usr/bin/perl

Modified:
    spamassassin/trunk/masses/rule-qa/nightly-slave-start

Modified: spamassassin/trunk/masses/rule-qa/nightly-slave-start
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/nightly-slave-start?rev=638800&r1=638799&r2=638800&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/nightly-slave-start (original)
+++ spamassassin/trunk/masses/rule-qa/nightly-slave-start Wed Mar 19 04:49:04 2008
@@ -6,8 +6,6 @@
 host=`echo "$1" | perl -ne 's/:-j(\S+)$//;print'`
 opts=`echo "$1" | perl -ne 's/:-j(\S+)$// and print "-j $1"'`
 
-# use $PERL from env if unset
-[ "x${PERL:-}" = x ] && PERL=perl
 set -x
 set -e
 
@@ -35,13 +33,16 @@
     cd $clienttree/code \; \
     tar xfz - < $tmp/tf 
 
-# source /etc/profile to get a full $PATH, including /usr/local/bin
-# (some hosts need to use /usr/local/bin/perl instead of /usr/bin/perl).
+# source $HOME/envs to get whatever $PATH we need to use the correct perl.
+# (some hosts need to use /usr/local/bin/perl or $HOME/perl588/bin/perl
+# instead of /usr/bin/perl).  Host admins: if your host needs a custom
+# perl, here's where to prepend that to the $PATH!
+
 # rebuild to compile the blib modules for this platform.
 
 ssh $host \
+    . envs \; \
     cd $clienttree/code \; \
-    . /etc/profile \; \
     perl Makefile.PL \; \
     make clean \; \
     perl Makefile.PL \; \
@@ -50,8 +51,8 @@
 # use a cs_cache in $clienttree/cs_cache -- this is not removed
 # with the above "rm -rf" command
 ssh -f $host \
+    . envs \; \
     cd $clienttree/code/masses \; \
-    . /etc/profile \; \
     TZ=UTC perl mass-check \
         --cs_ssl --cs_verbose --cs_schedule_cache --cs_cachedir=../../cs_cache \
         --reuse $opts \