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

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

Browse Source 
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2008-02-02 07:32:56 +01:00 committed by Junio C Hamano
parent 5884f1fe96
commit 2e0c290299
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
git-instaweb.sh
View File

@ -24,8 +24,6 @@ restart restart the web server
fqgitdir="$GIT_DIR" fqgitdir="$GIT_DIR"
local="`git config --bool --get instaweb.local`" local="`git config --bool --get instaweb.local`"
httpd="`git config --get instaweb.httpd`" 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` port=`git config --get instaweb.port`
module_path="`git config --get instaweb.modulepath`" 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) # if installed, it doesn't need further configuration (module_path)
test -z "$httpd" && httpd='lighttpd -f' 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... # any untaken local port will do...
test -z "$port" && port=1234 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 start_httpd
url=http://127.0.0.1:$port url=http://127.0.0.1:$port
test -n "$browser" && {
init_browser_path "$browser" if test -n "$browser"; then
"$browser_path" $url git web--browse -b "$browser" $url || echo $url
} || echo $url else
git web--browse -c "instaweb.browser" $url || echo $url
fi