instaweb: use 'git-web--browse' to launch browser.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-instaweb.sh b/git-instaweb.sh
index 3e4452bc4bc1fe57c75848ccd9c073aeb065a980..6f91c8f845b2c4ef426a6451ac07abae2bce9488 100755 (executable)
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -24,8 +24,6 @@ restart        restart the web server
 fqgitdir="$GIT_DIR"
 local="`git config --bool --get instaweb.local`"
 httpd="`git config --get instaweb.httpd`"
 fqgitdir="$GIT_DIR"
 local="`git config --bool --get instaweb.local`"
 httpd="`git config --get instaweb.httpd`"

-browser="`git config --get instaweb.browser`"
-test -z "$browser" && browser="`git config --get web.browser`"

 port=`git config --get instaweb.port`
 module_path="`git config --get instaweb.modulepath`"
 
 port=`git config --get instaweb.port`
 module_path="`git config --get instaweb.modulepath`"
 


@@ -36,9 +34,6 @@ conf="$GIT_DIR/gitweb/httpd.conf"
 # if installed, it doesn't need further configuration (module_path)
 test -z "$httpd" && httpd='lighttpd -f'
 
 # if installed, it doesn't need further configuration (module_path)
 test -z "$httpd" && httpd='lighttpd -f'
 

-# probably the most popular browser among gitweb users
-test -z "$browser" && browser='firefox'
-

 # any untaken local port will do...
 test -z "$port" && port=1234
 
 # any untaken local port will do...
 test -z "$port" && port=1234
 


@@ -274,14 +269,11 @@ webrick)
        ;;
 esac
 
        ;;
 esac
 

-init_browser_path() {
-       browser_path="`git config browser.$1.path`"
-       test -z "$browser_path" && browser_path="$1"
-}
-

 start_httpd
 url=http://127.0.0.1:$port
 start_httpd
 url=http://127.0.0.1:$port

-test -n "$browser" && {
-       init_browser_path "$browser"
-       "$browser_path" $url
-} || echo $url
+
+if test -n "$browser"; then
+       git web--browse -b "$browser" $url || echo $url
+else
+       git web--browse -c "instaweb.browser" $url || echo $url
+fi