undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

instaweb: Minor cleanups and fixes for potential problems

Browse Source 
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 <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonas Fonseca 2007-11-09 00:21:42 +01:00 committed by Junio C Hamano
parent d9c8344b46
commit 9126425df1
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
git-instaweb.sh
View File

@ -15,7 +15,7 @@ browser="`git config --get instaweb.browser`"
port=`git config --get instaweb.port` port=`git config --get instaweb.port`
module_path="`git config --get instaweb.modulepath`" module_path="`git config --get instaweb.modulepath`"
conf=$GIT_DIR/gitweb/httpd.conf conf="$GIT_DIR/gitweb/httpd.conf"
# Defaults: # Defaults:
@ -32,7 +32,7 @@ start_httpd () {
httpd_only="`echo $httpd | cut -f1 -d' '`" httpd_only="`echo $httpd | cut -f1 -d' '`"
if case "$httpd_only" in /*) : ;; *) which $httpd_only >/dev/null;; esac if case "$httpd_only" in /*) : ;; *) which $httpd_only >/dev/null;; esac
then then
$httpd $fqgitdir/gitweb/httpd.conf $httpd "$fqgitdir/gitweb/httpd.conf"
else else
# many httpds are installed in /usr/sbin or /usr/local/sbin # many httpds are installed in /usr/sbin or /usr/local/sbin
# these days and those are not in most users $PATHs # these days and those are not in most users $PATHs
@ -146,14 +146,14 @@ server.pid-file = "$fqgitdir/pid"
cgi.assign = ( ".cgi" => "" ) cgi.assign = ( ".cgi" => "" )
mimetype.assign = ( ".css" => "text/css" ) mimetype.assign = ( ".css" => "text/css" )
EOF 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 () { apache2_conf () {
test -z "$module_path" && module_path=/usr/lib/apache2/modules test -z "$module_path" && module_path=/usr/lib/apache2/modules
mkdir -p "$GIT_DIR/gitweb/logs" mkdir -p "$GIT_DIR/gitweb/logs"
bind= 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 echo 'text/css css' > $fqgitdir/mime.types
cat > "$conf" <<EOF cat > "$conf" <<EOF
ServerName "git-instaweb" ServerName "git-instaweb"
@ -206,7 +206,7 @@ EOF
} }
script=' script='
s#^\(my\|our\) $projectroot =.*#\1 $projectroot = "'`dirname $fqgitdir`'";# s#^\(my\|our\) $projectroot =.*#\1 $projectroot = "'$(dirname "$fqgitdir")'";#
s#\(my\|our\) $gitbin =.*#\1 $gitbin = "'$GIT_EXEC_PATH'";# s#\(my\|our\) $gitbin =.*#\1 $gitbin = "'$GIT_EXEC_PATH'";#
s#\(my\|our\) $projects_list =.*#\1 $projects_list = $projectroot;# 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'";#'
@ -226,8 +226,8 @@ gitweb_css () {
EOFGITWEB EOFGITWEB
} }
gitweb_cgi $GIT_DIR/gitweb/gitweb.cgi gitweb_cgi "$GIT_DIR/gitweb/gitweb.cgi"
gitweb_css $GIT_DIR/gitweb/gitweb.css gitweb_css "$GIT_DIR/gitweb/gitweb.css"
case "$httpd" in case "$httpd" in
*lighttpd*) *lighttpd*)
@ -243,6 +243,5 @@ case "$httpd" in
esac esac
start_httpd start_httpd
test -z "$browser" && browser=echo
url=http://127.0.0.1:$port url=http://127.0.0.1:$port
$browser $url || echo $url "$browser" $url || echo $url