Re: [PATCH 1/4] instaweb: ignore GITWEB_CONFIG_SYSTEM

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 3, 2010, 17:23 UTC
Message-ID: <7vfwxqzqoq.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20100902235429.GB6466@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

> The configuration in /etc/gitweb.conf might specify any old
> layout; in particular, it is likely not to be identical to that
> which git instaweb sets up.  Noticed by Uwe Kleine-König.

I am not sure if this is a reasonable change by reading the above. In some cases, the file may stale, but in other cases, it may specify what the site administrator wants its users to be using, no?

Show 19 quoted lines

>
> Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Cc: Eric Wong <normalperson@yhbt.net>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> ---
>  git-instaweb.sh |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/git-instaweb.sh b/git-instaweb.sh
> index f608014..6279f4d 100755
> --- a/git-instaweb.sh
> +++ b/git-instaweb.sh
> @@ -375,7 +375,8 @@ script='
>  s#^(my|our) \$projectroot =.*#$1 \$projectroot = "'$(dirname "$fqgitdir")'";#;
>  s#(my|our) \$gitbin =.*#$1 \$gitbin = "'$GIT_EXEC_PATH'";#;
>  s#(my|our) \$projects_list =.*#$1 \$projects_list = \$projectroot;#;
> -s#(my|our) \$git_temp =.*#$1 \$git_temp = "'$fqgitdir/gitweb/tmp'";#;'
> +s#(my|our) \$git_temp =.*#$1 \$git_temp = "'$fqgitdir/gitweb/tmp'";#;
> +s#(my|our) \$GITWEB_CONFIG_SYSTEM =.*#$1 \$GITWEB_CONFIG_SYSTEM = "";#;'

Perhaps moving the last ' to its own line would help maintaining the script in the longer term?

Show 5 quoted lines

>  
>  gitweb_cgi () {
>  	cat > "$1.tmp" <<\EOFGITWEB
> -- 
> 1.7.2.2