Re: [PATCH] gitweb-lib.sh: Set up PATH to use perl from /usr/bin
- From
Jeff King <peff@peff.net>
- Date
- May 1, 2012, 17:08 UTC
- Message-ID
- <20120501170810.GA22444@sigill.intra.peff.net>
- In-Reply-To
- <4FA0176B.50300@in.waw.pl>
On Tue, May 01, 2012 at 07:03:39PM +0200, Zbigniew Jędrzejewski-Szmek wrote:
Show 8 quoted lines
> But I don't see why we would use a different perl in
> git-am.sh: perl -ne 'BEGIN { $subject = 0 }
> git-am.sh: perl -M'POSIX qw(strftime)' -ne 'BEGIN { $subject = 0 }
> git-request-pull.sh:ref=$(git ls-remote "$url" | perl -e "$find_matching_ref" "$head" "$headrev")
> git-submodule.sh: perl -e '
> test-sha1.sh: perl -pe 'y/\000/g/'
> test-sha1.sh: perl -pe 'y/\000/g/'
> and lot of files in t/. Shouldn't those be replaced too?No. There are two ways in which we use perl:
1. To run our complex scripts like gitweb, git-svn, etc. These require
a reasonably modern perl version, and the user must specify it with
PERL_PATH if it is not in /usr/bin. 2. To run little snippets that _could_ be written in sed or awk, but
which cause portability problems on crappy versions of those tools.
These should run under any version of perl5.It's OK to use 'perl' from the path for (2), because we are not asking very much of perl in that case.
I think the patch we want is just:
diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh index 21d11d6..ae2dc46 100644 --- a/t/gitweb-lib.sh +++ b/t/gitweb-lib.sh @@ -69,7 +69,7 @@ gitweb_run () { # written to web server logs, so we are not interested in that: # we are interested only in properly formatted errors/warnings rm -f gitweb.log && - perl -- "$SCRIPT_NAME" \ + "$PERL_PATH" -- "$SCRIPT_NAME" \ >gitweb.output 2>gitweb.log && perl -w -e ' open O, ">gitweb.headers"; no? Torsten, does that fix your problem? -Peff