From: Kyle J. McKay <mackyle@gmail.com>
Date: Sun, 8 Mar 2015 05:05:38 +0000 (-0800)
Subject: git-instaweb: use @SHELL_PATH@ instead of /bin/sh
X-Git-Tag: v2.4.0-rc0~35^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff7a9dc2c503360190650d604dbdbc293d99b765;p=thirdparty%2Fgit.git

git-instaweb: use @SHELL_PATH@ instead of /bin/sh

If the user has configured a value for SHELL_PATH then
be sure to use it for any generated scripts instead of
hard-coding /bin/sh.

The first line of the script is handled specially, but
the embedded #!/bin/sh line in the here document will
not be automatically updated unless it uses @SHELL_PATH@.

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-instaweb.sh b/git-instaweb.sh
index 4c0af04fe9..47e38f34c3 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -205,7 +205,7 @@ webrick_conf () {
 	# actual gitweb.cgi using a shell script to force it
   wrapper="$fqgitdir/gitweb/$httpd/wrapper.sh"
 	cat > "$wrapper" <<EOF
-#!/bin/sh
+#!@SHELL_PATH@
 # we use this shell script wrapper around the real gitweb.cgi since
 # there appears to be no other way to pass arbitrary environment variables
 # into the CGI process