Merge branch 'jc/maint-add-p-overlapping-hunks' into maint
[gitweb.git] / git-web--browse.sh
index 3fc4166b25714911b6b1294c7439da1e237e4918..e9de241dd004a9f5d6d6d8e6a300a1fa5949a46d 100755 (executable)
@@ -31,154 +31,161 @@ valid_custom_tool()
 
 valid_tool() {
        case "$1" in
-               firefox | iceweasel | chrome | google-chrome | chromium | konqueror | w3m | links | lynx | dillo | open | start)
-                       ;; # happy
-               *)
-                       valid_custom_tool "$1" || return 1
-                       ;;
+       firefox | iceweasel | seamonkey | iceape | \
+       chrome | google-chrome | chromium | chromium-browser |\
+       konqueror | opera | w3m | elinks | links | lynx | dillo | open | start)
+               ;; # happy
+       *)
+               valid_custom_tool "$1" || return 1
+               ;;
        esac
 }
 
 init_browser_path() {
        browser_path=$(git config "browser.$1.path")
-       test -z "$browser_path" && browser_path="$1"
+       if test -z "$browser_path" &&
+          test "$1" = chromium &&
+          type chromium-browser >/dev/null 2>&1
+       then
+               browser_path=chromium-browser
+       fi
+       : ${browser_path:="$1"}
 }
 
 while test $# != 0
 do
-    case "$1" in
+       case "$1" in
        -b|--browser*|-t|--tool*)
-           case "$#,$1" in
+               case "$#,$1" in
                *,*=*)
-                   browser=`expr "z$1" : 'z-[^=]*=\(.*\)'`
-                   ;;
+                       browser=`expr "z$1" : 'z-[^=]*=\(.*\)'`
+                       ;;
                1,*)
-                   usage ;;
+                       usage ;;
                *)
-                   browser="$2"
-                   shift ;;
-           esac
-           ;;
+                       browser="$2"
+                       shift ;;
+               esac
+               ;;
        -c|--config*)
-           case "$#,$1" in
+               case "$#,$1" in
                *,*=*)
-                   conf=`expr "z$1" : 'z-[^=]*=\(.*\)'`
-                   ;;
+                       conf=`expr "z$1" : 'z-[^=]*=\(.*\)'`
+                       ;;
                1,*)
-                   usage ;;
+                       usage ;;
                *)
-                   conf="$2"
-                   shift ;;
-           esac
-           ;;
+                       conf="$2"
+                       shift ;;
+               esac
+               ;;
        --)
-           break
-           ;;
+               break
+               ;;
        -*)
-           usage
-           ;;
+               usage
+               ;;
        *)
-           break
-           ;;
-    esac
-    shift
+               break
+               ;;
+       esac
+       shift
 done
 
 test $# = 0 && usage
 
 if test -z "$browser"
 then
-    for opt in "$conf" "web.browser"
-    do
-       test -z "$opt" && continue
-       browser="`git config $opt`"
-       test -z "$browser" || break
-    done
-    if test -n "$browser" && ! valid_tool "$browser"; then
-       echo >&2 "git config option $opt set to unknown browser: $browser"
-       echo >&2 "Resetting to default..."
-       unset browser
-    fi
+       for opt in "$conf" "web.browser"
+       do
+               test -z "$opt" && continue
+               browser="`git config $opt`"
+               test -z "$browser" || break
+       done
+       if test -n "$browser" && ! valid_tool "$browser"; then
+               echo >&2 "git config option $opt set to unknown browser: $browser"
+               echo >&2 "Resetting to default..."
+               unset browser
+       fi
 fi
 
 if test -z "$browser" ; then
-    if test -n "$DISPLAY"; then
-       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"
+       if test -n "$DISPLAY"; then
+               browser_candidates="firefox iceweasel google-chrome chrome chromium chromium-browser 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 elinks links lynx"
        fi
-    else
-       browser_candidates="w3m links lynx"
-    fi
-    # SECURITYSESSIONID indicates an OS X GUI login session
-    if test -n "$SECURITYSESSIONID" \
-           -o "$TERM_PROGRAM" = "Apple_Terminal" ; then
-       browser_candidates="open $browser_candidates"
-    fi
-    # /bin/start indicates MinGW
-    if test -x /bin/start; then
-       browser_candidates="start $browser_candidates"
-    fi
-
-    for i in $browser_candidates; do
-       init_browser_path $i
-       if type "$browser_path" > /dev/null 2>&1; then
-           browser=$i
-           break
+       # SECURITYSESSIONID indicates an OS X GUI login session
+       if test -n "$SECURITYSESSIONID" \
+               -o "$TERM_PROGRAM" = "Apple_Terminal" ; then
+               browser_candidates="open $browser_candidates"
        fi
-    done
-    test -z "$browser" && die "No known browser available."
+       # /bin/start indicates MinGW
+       if test -x /bin/start; then
+               browser_candidates="start $browser_candidates"
+       fi
+
+       for i in $browser_candidates; do
+               init_browser_path $i
+               if type "$browser_path" > /dev/null 2>&1; then
+                       browser=$i
+                       break
+               fi
+       done
+       test -z "$browser" && die "No known browser available."
 else
-    valid_tool "$browser" || die "Unknown browser '$browser'."
+       valid_tool "$browser" || die "Unknown browser '$browser'."
 
-    init_browser_path "$browser"
+       init_browser_path "$browser"
 
-    if test -z "$browser_cmd" && ! type "$browser_path" > /dev/null 2>&1; then
-       die "The browser $browser is not available as '$browser_path'."
-    fi
+       if test -z "$browser_cmd" && ! type "$browser_path" > /dev/null 2>&1; then
+               die "The browser $browser is not available as '$browser_path'."
+       fi
 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'
        test "$vers" -lt 2 && NEWTAB=''
        "$browser_path" $NEWTAB "$@" &
        ;;
-    google-chrome|chrome|chromium)
-       # Actual command for chromium is chromium-browser.
+google-chrome|chrome|chromium|chromium-browser)
        # No need to specify newTab. It's default in chromium
        eval "$browser_path" "$@" &
        ;;
-    konqueror)
+konqueror)
        case "$(basename "$browser_path")" in
-           konqueror)
+       konqueror)
                # It's simpler to use kfmclient to open a new tab in konqueror.
                browser_path="$(echo "$browser_path" | sed -e 's/konqueror$/kfmclient/')"
                type "$browser_path" > /dev/null 2>&1 || die "No '$browser_path' found."
                eval "$browser_path" newTab "$@"
                ;;
-           kfmclient)
+       kfmclient)
                eval "$browser_path" newTab "$@"
                ;;
-           *)
+       *)
                "$browser_path" "$@" &
                ;;
        esac
        ;;
-    w3m|links|lynx|open)
+w3m|elinks|links|lynx|open)
        eval "$browser_path" "$@"
        ;;
-    start)
-        exec "$browser_path" '"web-browse"' "$@"
-        ;;
-    dillo)
+start)
+       exec "$browser_path" '"web-browse"' "$@"
+       ;;
+opera|dillo)
        "$browser_path" "$@" &
        ;;
-    *)
+*)
        if test -n "$browser_cmd"; then
-           ( eval $browser_cmd "$@" )
+               ( eval $browser_cmd "$@" )
        fi
        ;;
 esac