Commit ec136663 authored by Nathan W. Panike's avatar Nathan W. Panike Committed by Junio C Hamano

Add a google-chrome option for web--browse

On some systems, the chrome browser is named google-chrome.  We add
support for this case.
Signed-off-by: default avatarNathan W. Panike <nathan.panike@gmail.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent ffd45f96
......@@ -31,7 +31,7 @@ valid_custom_tool()
valid_tool() {
case "$1" in
firefox | iceweasel | chrome | chromium | konqueror | w3m | links | lynx | dillo | open | start)
firefox | iceweasel | chrome | google-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 chrome chromium konqueror w3m links lynx dillo"
browser_candidates="firefox iceweasel google-chrome chrome chromium konqueror w3m links lynx dillo"
if test "$KDE_FULL_SESSION" = "true"; then
browser_candidates="konqueror $browser_candidates"
fi
......@@ -146,7 +146,7 @@ case "$browser" in
test "$vers" -lt 2 && NEWTAB=''
"$browser_path" $NEWTAB "$@" &
;;
chrome|chromium)
google-chrome|chrome|chromium)
# Actual command for chromium is chromium-browser.
# No need to specify newTab. It's default in chromium
eval "$browser_path" "$@" &
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment