[PATCHv2 4/7] web--browse: support opera, seamonkey and elinks
From: Giuseppe Bilotta <hidden>
Date: 2016-06-15 22:50:10
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
The list of supported browsers is also updated in the documentation. Signed-off-by: Giuseppe Bilotta <redacted> --- Documentation/git-web--browse.txt | 6 ++++++ git-web--browse.sh | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt
index 51e8e0a..5d3ae07 100644
--- a/Documentation/git-web--browse.txt
+++ b/Documentation/git-web--browse.txt@@ -20,8 +20,14 @@ The following browsers (or commands) are currently supported: * firefox (this is the default under X Window when not using KDE) * iceweasel +* seamonkey +* iceape +* chromium +* google-chrome * konqueror (this is the default under KDE, see 'Note about konqueror' below) +* opera * w3m (this is the default outside graphical environments) +* elinks * links * lynx * dillo
diff --git a/git-web--browse.sh b/git-web--browse.sh
index e48e30d..48e5a28 100755
--- a/git-web--browse.sh
+++ b/git-web--browse.sh@@ -31,8 +31,8 @@ valid_custom_tool() valid_tool() { case "$1" in - firefox | iceweasel | chrome | google-chrome | chromium |\ - konqueror | w3m | links | lynx | dillo | open | start) + firefox | iceweasel | seamonkey | iceape | chrome | google-chrome | chromium |\ + konqueror | opera | w3m | elinks | links | lynx | dillo | open | start) ;; # happy *) valid_custom_tool "$1" || return 1
@@ -104,12 +104,12 @@ fi if test -z "$browser" ; 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 browser_candidates="konqueror $browser_candidates" fi else - browser_candidates="w3m links lynx" + browser_candidates="w3m elinks links lynx" fi # SECURITYSESSIONID indicates an OS X GUI login session if test -n "$SECURITYSESSIONID" \
@@ -140,7 +140,7 @@ else fi case "$browser" in -firefox|iceweasel) +firefox|iceweasel|seamonkey|iceape) # Check version because firefox < 2.0 does not support "-new-tab". vers=$(expr "$($browser_path -version)" : '.* \([0-9][0-9]*\)\..*') NEWTAB='-new-tab'
@@ -168,13 +168,13 @@ konqueror) ;; esac ;; -w3m|links|lynx|open) +w3m|elinks|links|lynx|open) eval "$browser_path" "$@" ;; start) exec "$browser_path" '"web-browse"' "$@" ;; -dillo) +opera|dillo) "$browser_path" "$@" & ;; *)
--
1.7.3.2.664.g294b8.dirty