From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Wed, 26 Jul 2006 21:11:46 +0000 (+0200)
Subject: instaweb: Be more clear if httpd or the browser fail
X-Git-Tag: v1.4.2-rc3~54
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5209eda86363a3ba2e000903ad8de29589b18b58;p=git.git

instaweb: Be more clear if httpd or the browser fail

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-instaweb.sh b/git-instaweb.sh
index 9829c5915..16cd351f7 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -54,6 +54,10 @@ start_httpd () {
 			fi
 		done
 	fi
+	if test $? != 0; then
+		echo "Could not execute http daemon $httpd."
+		exit 1
+	fi
 }
 
 stop_httpd () {
@@ -184,7 +188,7 @@ EOF
 	else
 		# plain-old CGI
 		list_mods=`echo "$httpd" | sed "s/-f$/-l/"`
-		$list_mods | grep 'mod_cgi\.c' >/dev/null || \
+		$list_mods | grep 'mod_cgi\.c' >/dev/null 2>&1 || \
 		echo "LoadModule cgi_module $module_path/mod_cgi.so" >> "$conf"
 		cat >> "$conf" <<EOF
 AddHandler cgi-script .cgi
@@ -234,4 +238,5 @@ esac
 
 start_httpd
 test -z "$browser" && browser=echo
-$browser http://127.0.0.1:$port
+url=http://127.0.0.1:$port
+$browser $url || echo $url