1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-05 08:47:56 +01:00

Merge branch 'ps/gitweb--browse-chrome'

* ps/gitweb--browse-chrome:
  git-web--browse: Add support for google chrome and chromium
This commit is contained in:
Junio C Hamano 2010-06-18 11:16:56 -07:00
commit 2ad6b14353

View file

@ -31,7 +31,7 @@ valid_custom_tool()
valid_tool() {
case "$1" in
firefox | iceweasel | konqueror | w3m | links | lynx | dillo | open | start)
firefox | iceweasel | chrome | chromium | konqueror | w3m | links | lynx | dillo | open | start)
;; # happy
*)
valid_custom_tool "$1" || return 1
@ -103,7 +103,7 @@ fi
if test -z "$browser" ; then
if test -n "$DISPLAY"; then
browser_candidates="firefox iceweasel konqueror w3m links lynx dillo"
browser_candidates="firefox iceweasel chrome chromium konqueror w3m links lynx dillo"
if test "$KDE_FULL_SESSION" = "true"; then
browser_candidates="konqueror $browser_candidates"
fi
@ -146,6 +146,11 @@ case "$browser" in
test "$vers" -lt 2 && NEWTAB=''
"$browser_path" $NEWTAB "$@" &
;;
chrome|chromium)
# Actual command for chromium is chromium-browser.
# No need to specify newTab. It's default in chromium
eval "$browser_path" "$@" &
;;
konqueror)
case "$(basename "$browser_path")" in
konqueror)