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 9829c591543b0fe4dd55b996cb399d925dda08ab..16cd351f7f0d992be37be83017961c70731d4cc5 100755 (executable)
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -54,6 +54,10 @@ start_httpd () {
                        fi
                done
        fi
                        fi
                done
        fi

+       if test $? != 0; then
+               echo "Could not execute http daemon $httpd."
+               exit 1
+       fi

 }
 
 stop_httpd () {
 }
 
 stop_httpd () {


@@ -184,7 +188,7 @@ EOF
        else
                # plain-old CGI
                list_mods=`echo "$httpd" | sed "s/-f$/-l/"`
        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
                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
 
 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