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

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

[Chris Webb]

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>
---
 git-instaweb.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-instaweb.sh b/git-instaweb.sh
index d4941a9..f608014 100755
--- 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"
 
-setenv.add-environment = ( "PATH" => "/usr/local/bin:/usr/bin:/bin" )
+setenv.add-environment = ( "PATH" => env.PATH )
 
 cgi.assign = ( ".cgi" => "" )
 
@@ -361,7 +361,7 @@ error_log	$fqgitdir/gitweb/error.log
 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
 
-- 
1.7.0.3

Re: [PATCH] git-instaweb: pass through invoking user's path to gitweb CGI scripts

[Eric Wong]

Chris Webb <chris@arachsys.com> wrote:
> 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>

Looks good to me, thanks Chris.

Acked-by: Eric Wong <normalperson@yhbt.net>

> ---
>  git-instaweb.sh |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/git-instaweb.sh b/git-instaweb.sh
> index d4941a9..f608014 100755
> --- 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"
>  
> -setenv.add-environment = ( "PATH" => "/usr/local/bin:/usr/bin:/bin" )
> +setenv.add-environment = ( "PATH" => env.PATH )
>  
>  cgi.assign = ( ".cgi" => "" )
>  
> @@ -361,7 +361,7 @@ error_log	$fqgitdir/gitweb/error.log
>  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
>  
> -- 
> 1.7.0.3
> 

Re: [PATCH] git-instaweb: pass through invoking user's path to gitweb CGI scripts

[Junio C Hamano]

Thanks, both.  Will queue.