Debian and derivatives have an alternatives-based default browser configuration that uses the /usr/bin/x-www-browser and /usr/bin/www-browser symlinks. When no browser is selected by the user and the Debian alternatives are available, try to see if they are one of our recognized selection and in the affermative case use it. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@xxxxxxxxx> --- Documentation/git-web--browse.txt | 4 ++++ git-web--browse.sh | 34 +++++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt index 5d3ae07..76b5cdc 100644 --- a/Documentation/git-web--browse.txt +++ b/Documentation/git-web--browse.txt @@ -36,6 +36,10 @@ The following browsers (or commands) are currently supported: Custom commands may also be specified. +If no default browser is specified, and /usr/bin/x-www-browser +(under X) or /usr/bin/www-browser is present, they are used to determine +the browser to use. + OPTIONS ------- -b <browser>:: diff --git a/git-web--browse.sh b/git-web--browse.sh index 7b7f45f..f991dd0 100755 --- a/git-web--browse.sh +++ b/git-web--browse.sh @@ -102,6 +102,33 @@ then fi fi +# Debian and derivatives use x-www-browser or www-browser to set +# the default browser for the system +if test -z "$browser" ; then + wwwbrowser="/usr/bin/www-browser" + if test -n "$DISPLAY"; then + wwwbrowser="/usr/bin/x-www-browser $wwwbrowser" + fi + for i in $wwwbrowser; do + if test -x $i ; then + verstring="$($i --version 2> /dev/null | head -n 1)" + browser="$(echo "$verstring" | cut -f1 -d' ' | tr A-Z a-z)" + case "$browser" in + mozilla) + browser="$(echo "$verstring" | cut -f2 -d' ' | tr A-Z a-z)" + ;; + google) + browser="google-chrome" + ;; + esac + if valid_tool "$browser" ; then + browser_path="$i" + break + fi + fi + done +fi + if test -z "$browser" ; then if test -n "$DISPLAY"; then browser_candidates="firefox iceweasel google-chrome chrome chromium konqueror opera seamonkey iceape w3m elinks links lynx dillo" @@ -129,7 +156,7 @@ if test -z "$browser" ; then fi done test -z "$browser" && die "No known browser available." -else +else if test -z "$browser_path"; then valid_tool "$browser" || die "Unknown browser '$browser'." init_browser_path "$browser" @@ -137,12 +164,13 @@ else 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 +fi fi case "$browser" in firefox|iceweasel|seamonkey|iceape) # Check version because firefox < 2.0 does not support "-new-tab". - vers=$(expr "$($browser_path -version)" : '.* \([0-9][0-9]*\)\..*') + test -z "$verstring" && verstring="$($browser_path -version)" + vers=$(expr "$verstring" : '.* \([0-9][0-9]*\)\..*') NEWTAB='-new-tab' test "$vers" -lt 2 && NEWTAB='' "$browser_path" $NEWTAB "$@" & -- 1.7.3.2.624.gec6c7.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html