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>

diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt
index 51e8e0af1e7ff37ce4abfe53b6d52e9935b536a8..5d3ae0726e7cdfd871ab9155c064babb21e05fad 100644 (file)
--- 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
 
 * 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)
 * 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
 * lynx
 * dillo
 * links
 * lynx
 * dillo

diff --git a/git-web--browse.sh b/git-web--browse.sh
index bb3a669f1163f00317c5c46b1adfab8d4894bb35..c108eefb4810e1167f28a563b02895266da3098f 100755 (executable)
--- a/git-web--browse.sh
+++ b/git-web--browse.sh
@@ -31,8 +31,8 @@ valid_custom_tool()
 
 valid_tool() {
        case "$1" in
 
 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
                ;; # happy
        *)
                valid_custom_tool "$1" || return 1


@@ -104,12 +104,12 @@ fi
 
 if test -z "$browser" ; then
        if test -n "$DISPLAY"; then
 
 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
                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" \
        fi
        # SECURITYSESSIONID indicates an OS X GUI login session
        if test -n "$SECURITYSESSIONID" \


@@ -140,7 +140,7 @@ else
 fi
 
 case "$browser" in
 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'
        # 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
        ;;
                ;;
        esac
        ;;

-w3m|links|lynx|open)
+w3m|elinks|links|lynx|open)

        eval "$browser_path" "$@"
        ;;
 start)
        exec "$browser_path" '"web-browse"' "$@"
        ;;
        eval "$browser_path" "$@"
        ;;
 start)
        exec "$browser_path" '"web-browse"' "$@"
        ;;

-dillo)
+opera|dillo)

        "$browser_path" "$@" &
        ;;
 *)
        "$browser_path" "$@" &
        ;;
 *)