[PATCHv3 4/6] web--browse: better support for chromium
- From
Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
- Date
- Dec 6, 2010, 17:49 UTC
- Message-ID
- <1291657790-3719-5-git-send-email-giuseppe.bilotta@gmail.com>
- In-Reply-To
- <1291657790-3719-1-git-send-email-giuseppe.bilotta@gmail.com>
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> --- Documentation/git-web--browse.txt | 4 ++-- git-web--browse.sh | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 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 48e5a28..b2fc3b4 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,6 +43,10 @@ valid_tool() { init_browser_path() { browser_path=$(git config "browser.$1.path") + if test -z "$browser_path" -a "$1" = chromium && + type chromium-browser > /dev/null 2>&1 ; then + browser_path=chromium-browser + fi test -z "$browser_path" && browser_path="$1" } @@ -104,7 +109,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 +152,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" "$@" & ;;
-- 1.7.3.2.664.g294b8.dirty