git-instaweb: pass through invoking user's path to gitweb CGI scripts

When used with lighttpd or mongoose, git-instaweb previously passed a
hard-coded, default value of PATH to the gitweb CGI script. Use the invoking
user's value for PATH for this instead. (This is already implicitly the
behaviour for other web servers supported by git-instaweb.)

Signed-off-by: Chris Webb <chris@arachsys.com>
Acked-by: Eric Wong <normalperson@yhbt.net>

diff --git a/git-instaweb.sh b/git-instaweb.sh
index d4941a9ce6f1e0ef2c0eb6575c408798cc730451..f6080149c22bad8b3434b874b9e4079ac508ca69 100755 (executable)
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -212,7 +212,7 @@ server.errorlog = "$fqgitdir/gitweb/error.log"
 # variable above and uncomment this
 #accesslog.filename = "$fqgitdir/gitweb/access.log"
 
 # variable above and uncomment this
 #accesslog.filename = "$fqgitdir/gitweb/access.log"
 

-setenv.add-environment = ( "PATH" => "/usr/local/bin:/usr/bin:/bin" )
+setenv.add-environment = ( "PATH" => env.PATH )

 
 cgi.assign = ( ".cgi" => "" )
 
 
 cgi.assign = ( ".cgi" => "" )
 


@@ -361,7 +361,7 @@ error_log   $fqgitdir/gitweb/error.log
 access_log     $fqgitdir/gitweb/access.log
 
 #cgi setup
 access_log     $fqgitdir/gitweb/access.log
 
 #cgi setup

-cgi_env                PATH=/usr/local/bin:/usr/bin:/bin,GIT_DIR=$GIT_DIR,GIT_EXEC_PATH=$GIT_EXEC_PATH
+cgi_env                PATH=$PATH,GIT_DIR=$GIT_DIR,GIT_EXEC_PATH=$GIT_EXEC_PATH

 cgi_interp     $PERL
 cgi_ext                cgi,pl
 
 cgi_interp     $PERL
 cgi_ext                cgi,pl