X-Git-Url: https://git.exim.org/buildfarm-client.git/blobdiff_plain/e821a6475c789ea2c49ee8eb780c9c8c6302fc6f..34e7f3555072b6ac03fca1d9715909dc093f8a36:/run_branches

diff --git a/run_branches b/run_branches
index e837aa9..9e267af 100755
--- a/run_branches
+++ b/run_branches
@@ -12,21 +12,33 @@ use vars qw($VERSION); $VERSION = 'REL_0.1';
 
 use strict;
 use warnings;
+use 5.010;
+
 use Fcntl qw(:flock :seek);
-use EximBuild::Options;
 use File::Basename;
+use FindBin qw($RealBin);
+use Cwd;
 
+use lib $RealBin;
+use EximBuild::Options;
+
+sub branch_last_sort;
+
+# Complain on old-style use (.pl extension), but only if a
+# terminal is available.
 if ($0 =~ /(.*)\.pl$/) {
     die "$0: Please use `@{[join ' ' => $1, @ARGV]}' instead.\n"
         if -t;
     exec $1, @ARGV;
 }
 
-my %branch_last;
-sub branch_last_sort;
+# Most of the client code assumes that our working directory
+# is the client code directory.
+chdir $RealBin or die "$0: Can't chdir to '$RealBin': $!\n";
+say "Changed working directory to '$RealBin'" if -t;
 
-my $run_build;
-($run_build = $0) =~ s/run_branches/run_build/;
+my %branch_last;
+my $run_build = './run_build';
 
 my($run_all, $run_one);
 my %extra_options =(
@@ -41,14 +53,14 @@ EximBuild::Options::fetch_options(%extra_options);
 die("$0: non-option arguments not permitted")
   if @ARGV;
 
-die "only one of --run-all and --run-one permitted"
+die "$0: only one of --run-all and --run-one permitted"
   if ($run_all && $run_one);
 
-die "need one of --run-all and --run-one"
+die "$0: need one of --run-all and --run-one"
   unless ($run_all || $run_one);
 
 # common mistake
-die "need group searchable homedir"
+die "$0: need group searchable homedir"
   unless (stat($ENV{HOME}) & 0550 == 0550);
 
 # set up a "branch" variable for processing the config file
@@ -86,13 +98,11 @@ elsif ($EximBuild::conf{branches_to_build} =~
     # i.e. specially *not* the MinGW SDK perl that is invoked for the
     # build script, which means we need to put the path back the way it was
     # when we're done
-    my $save_path = $ENV{PATH};
-    $ENV{PATH} = $EximBuild::conf{build_env}->{PATH}
+    local $ENV{PATH} = $EximBuild::conf{build_env}->{PATH}
       if ($EximBuild::conf{build_env}->{PATH});
     (my $url = $EximBuild::conf{target}) =~s/cgi-bin.*/branches_of_interest.txt/;
     my $branches_of_interest = `perl -MLWP::Simple -e "getprint(q{$url})"`;
     die "getting branches of interest" unless $branches_of_interest;
-    $ENV{PATH} = $save_path;
     push(@branches,$_)foreach (split(/\s+/,$branches_of_interest));
     #splice(@branches,0,-2)
     #  if $EximBuild::conf{branches_to_build} eq 'HEAD_PLUS_LATEST';