From f71db097efa1cdd304bfa2dd6d365592c1866543 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Tue, 1 May 2012 13:55:00 -0400 Subject: [PATCH 1/2] t/gitweb-lib: use $PERL_PATH to run gitweb The current code runs "perl gitweb.cgi" to test gitweb. This will use whatever version of perl happens to be first in the PATH. We are better off using the specific perl that the user specified via PERL_PATH, which matches what gets put on the #!-line of the built gitweb.cgi. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/gitweb-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh index 292753f77c..f5fd940ff9 100644 --- a/t/gitweb-lib.sh +++ b/t/gitweb-lib.sh @@ -68,7 +68,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"; From 0754e089c1ffc6a40574eee0564ef98b3acacc26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 1 May 2012 22:18:18 +0200 Subject: [PATCH 2/2] Consistently use perl from /usr/bin/ for scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While the majority of scripts use '#!/usr/bin/perl', some use '#!/usr/bin/env perl'. In the end there is no difference, because the Makefile rewrites "#!.*perl" with "#!$PERL_PATH" in scripted Porcelains before installing. Nevertheless, the second form can be misleading, because it suggests that perl found first in $PATH will be used. Suggested-by: Junio C Hamano Signed-off-by: Zbigniew Jędrzejewski-Szmek Signed-off-by: Junio C Hamano --- git-relink.perl | 2 +- git-svn.perl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/git-relink.perl b/git-relink.perl index e136732cea..f29285c411 100755 --- a/git-relink.perl +++ b/git-relink.perl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Copyright 2005, Ryan Anderson # Distribution permitted under the GPL v2, as distributed # by the Free Software Foundation. diff --git a/git-svn.perl b/git-svn.perl index 89f83fd27a..40a823876b 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Copyright (C) 2006, Eric Wong # License: GPL v2 or later use 5.008;