web--browse: support opera, seamonkey and elinks
The list of supported browsers is also updated in the documentation. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
b968708b3e
commit
81f42f1149
|
@ -20,8 +20,14 @@ The following browsers (or commands) are currently supported:
|
||||||
|
|
||||||
* firefox (this is the default under X Window when not using KDE)
|
* firefox (this is the default under X Window when not using KDE)
|
||||||
* iceweasel
|
* iceweasel
|
||||||
|
* seamonkey
|
||||||
|
* iceape
|
||||||
|
* chromium
|
||||||
|
* google-chrome
|
||||||
* konqueror (this is the default under KDE, see 'Note about konqueror' below)
|
* konqueror (this is the default under KDE, see 'Note about konqueror' below)
|
||||||
|
* opera
|
||||||
* w3m (this is the default outside graphical environments)
|
* w3m (this is the default outside graphical environments)
|
||||||
|
* elinks
|
||||||
* links
|
* links
|
||||||
* lynx
|
* lynx
|
||||||
* dillo
|
* dillo
|
||||||
|
|
|
@ -31,8 +31,8 @@ valid_custom_tool()
|
||||||
|
|
||||||
valid_tool() {
|
valid_tool() {
|
||||||
case "$1" in
|
case "$1" in
|
||||||
firefox | iceweasel | chrome | google-chrome | chromium | \
|
firefox | iceweasel | seamonkey | iceape | chrome | google-chrome | chromium | \
|
||||||
konqueror | w3m | links | lynx | dillo | open | start)
|
konqueror | opera | w3m | elinks | links | lynx | dillo | open | start)
|
||||||
;; # happy
|
;; # happy
|
||||||
*)
|
*)
|
||||||
valid_custom_tool "$1" || return 1
|
valid_custom_tool "$1" || return 1
|
||||||
|
@ -104,12 +104,12 @@ fi
|
||||||
|
|
||||||
if test -z "$browser" ; then
|
if test -z "$browser" ; then
|
||||||
if test -n "$DISPLAY"; then
|
if test -n "$DISPLAY"; then
|
||||||
browser_candidates="firefox iceweasel google-chrome chrome chromium konqueror w3m links lynx dillo"
|
browser_candidates="firefox iceweasel google-chrome chrome chromium konqueror opera seamonkey iceape w3m elinks links lynx dillo"
|
||||||
if test "$KDE_FULL_SESSION" = "true"; then
|
if test "$KDE_FULL_SESSION" = "true"; then
|
||||||
browser_candidates="konqueror $browser_candidates"
|
browser_candidates="konqueror $browser_candidates"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
browser_candidates="w3m links lynx"
|
browser_candidates="w3m elinks links lynx"
|
||||||
fi
|
fi
|
||||||
# SECURITYSESSIONID indicates an OS X GUI login session
|
# SECURITYSESSIONID indicates an OS X GUI login session
|
||||||
if test -n "$SECURITYSESSIONID" \
|
if test -n "$SECURITYSESSIONID" \
|
||||||
|
@ -140,7 +140,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case "$browser" in
|
case "$browser" in
|
||||||
firefox|iceweasel)
|
firefox|iceweasel|seamonkey|iceape)
|
||||||
# Check version because firefox < 2.0 does not support "-new-tab".
|
# Check version because firefox < 2.0 does not support "-new-tab".
|
||||||
vers=$(expr "$($browser_path -version)" : '.* \([0-9][0-9]*\)\..*')
|
vers=$(expr "$($browser_path -version)" : '.* \([0-9][0-9]*\)\..*')
|
||||||
NEWTAB='-new-tab'
|
NEWTAB='-new-tab'
|
||||||
|
@ -168,13 +168,13 @@ konqueror)
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
w3m|links|lynx|open)
|
w3m|elinks|links|lynx|open)
|
||||||
eval "$browser_path" "$@"
|
eval "$browser_path" "$@"
|
||||||
;;
|
;;
|
||||||
start)
|
start)
|
||||||
exec "$browser_path" '"web-browse"' "$@"
|
exec "$browser_path" '"web-browse"' "$@"
|
||||||
;;
|
;;
|
||||||
dillo)
|
opera|dillo)
|
||||||
"$browser_path" "$@" &
|
"$browser_path" "$@" &
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
Loading…
Reference in New Issue