diff options
| author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2010-12-03 16:47:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-03 22:05:32 (GMT) |
| commit | 14ea67c0071804b7eb73cca35c87860f8fc6db95 (patch) | |
| tree | 48fde29b7f2a91f08e34552e483ab29adad04c97 | |
| parent | 81f42f11496b9117273939c98d270af273c8a463 (diff) | |
| download | git-14ea67c0071804b7eb73cca35c87860f8fc6db95.zip git-14ea67c0071804b7eb73cca35c87860f8fc6db95.tar.gz git-14ea67c0071804b7eb73cca35c87860f8fc6db95.tar.bz2 | |
web--browse: better support for chromium
On Debian-based distributions, Chromium the browser is available under
the name chromium-browser rather than chromium, to prevent conflicts
with the Chromium B.S.U. game.
Look for chromium-browser first when setting the path for chromium, and
also add chromium-browser as a supported browser name. Document the
dual-name support, and mention the dual-name support for
(google-)chrome too.
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-web--browse.txt | 4 | ||||
| -rwxr-xr-x | git-web--browse.sh | 16 |
2 files changed, 13 insertions, 7 deletions
diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt index 5d3ae07..c0416e5 100644 --- a/Documentation/git-web--browse.txt +++ b/Documentation/git-web--browse.txt @@ -22,8 +22,8 @@ The following browsers (or commands) are currently supported: * iceweasel * seamonkey * iceape -* chromium -* google-chrome +* chromium (also supported as chromium-browser) +* google-chrome (also supported as chrome) * konqueror (this is the default under KDE, see 'Note about konqueror' below) * opera * w3m (this is the default outside graphical environments) diff --git a/git-web--browse.sh b/git-web--browse.sh index c108eef..e9de241 100755 --- a/git-web--browse.sh +++ b/git-web--browse.sh @@ -31,7 +31,8 @@ valid_custom_tool() valid_tool() { case "$1" in - firefox | iceweasel | seamonkey | iceape | chrome | google-chrome | chromium | \ + firefox | iceweasel | seamonkey | iceape | \ + chrome | google-chrome | chromium | chromium-browser |\ konqueror | opera | w3m | elinks | links | lynx | dillo | open | start) ;; # happy *) @@ -42,7 +43,13 @@ valid_tool() { 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 @@ -104,7 +111,7 @@ 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" + 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 @@ -147,8 +154,7 @@ firefox|iceweasel|seamonkey|iceape) 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" "$@" & ;; |