From: Jonas Fonseca Date: Thu, 08 Nov 2007 15:49:40 GMT Subject: [PATCH] instaweb: Minor cleanups and fixes for potential problems Message-ID: <20071108154940.GA20988@diku.dk> Fix path quoting and test of empty values that some shells do not like. Remove duplicate check and setting of $browser. Signed-off-by: Jonas Fonseca --- git-instaweb.sh | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/git-instaweb.sh b/git-instaweb.sh index f05884c..fbacfb1 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -44,7 +44,7 @@ start_httpd () { httpd_only="`echo $httpd | cut -f1 -d' '`" if case "$httpd_only" in /*) : ;; *) which $httpd_only >/dev/null;; esac then - $httpd $fqgitdir/gitweb/httpd.conf + $httpd "$fqgitdir/gitweb/httpd.conf" else # many httpds are installed in /usr/sbin or /usr/local/sbin # these days and those are not in most users $PATHs @@ -158,7 +158,7 @@ EOF :DirectoryIndex: ["gitweb.cgi"] :PidFile: "$fqgitdir/pid" EOF - test "$local" = true && echo ':BindAddress: "127.0.0.1"' >> "$conf" + test x"$local" = xtrue && echo ':BindAddress: "127.0.0.1"' >> "$conf" } lighttpd_conf () { @@ -171,14 +171,14 @@ server.pid-file = "$fqgitdir/pid" cgi.assign = ( ".cgi" => "" ) mimetype.assign = ( ".css" => "text/css" ) EOF - test "$local" = true && echo 'server.bind = "127.0.0.1"' >> "$conf" + test x"$local" = xtrue && echo 'server.bind = "127.0.0.1"' >> "$conf" } apache2_conf () { test -z "$module_path" && module_path=/usr/lib/apache2/modules mkdir -p "$GIT_DIR/gitweb/logs" bind= - test "$local" = true && bind='127.0.0.1:' + test x"$local" = xtrue && bind='127.0.0.1:' echo 'text/css css' > $fqgitdir/mime.types cat > "$conf" <