diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-20 13:11:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 13:11:48 -0700 |
| commit | ec0465ade87996214959a393239eec520daf92ea (patch) | |
| tree | 714fd5f0ab87cba55d894a2031220ff7f5cf1aff /git-instaweb.sh | |
| parent | Merge branch 'rs/daemon-hostname-in-strbuf' (diff) | |
| parent | t5528: do not fail with FreeBSD shell (diff) | |
| download | tgif-ec0465ade87996214959a393239eec520daf92ea.tar.xz | |
Merge branch 'km/bsd-shells'
Portability fixes and workarounds for shell scripts have been added
to help BSD-derived systems.
* km/bsd-shells:
t5528: do not fail with FreeBSD shell
help.c: use SHELL_PATH instead of hard-coded "/bin/sh"
git-compat-util.h: move SHELL_PATH default into header
git-instaweb: use @SHELL_PATH@ instead of /bin/sh
git-instaweb: allow running in a working tree subdirectory
Diffstat (limited to 'git-instaweb.sh')
| -rwxr-xr-x | git-instaweb.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-instaweb.sh b/git-instaweb.sh index 513efa662e..47e38f34c3 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -20,6 +20,7 @@ start start the web server restart restart the web server " +SUBDIRECTORY_OK=Yes . git-sh-setup fqgitdir="$GIT_DIR" @@ -204,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 |