git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Subject: [PATCH 4/6] web--browse: support opera, seamonkey and elinks
Date: Mon, 29 Nov 2010 15:47:53 +0100	[thread overview]
Message-ID: <1291042075-19983-5-git-send-email-giuseppe.bilotta@gmail.com> (raw)
In-Reply-To: <1291042075-19983-1-git-send-email-giuseppe.bilotta@gmail.com>

The list of supported browsers is also updated in the documentation.

Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
---
 Documentation/git-web--browse.txt |    6 ++++++
 git-web--browse.sh                |   14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt
index 51e8e0a..5d3ae07 100644
--- 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
+* seamonkey
+* iceape
+* chromium
+* google-chrome
 * konqueror (this is the default under KDE, see 'Note about konqueror' below)
+* opera
 * w3m (this is the default outside graphical environments)
+* elinks
 * links
 * lynx
 * dillo
diff --git a/git-web--browse.sh b/git-web--browse.sh
index b20b0e0..7b7f45f 100755
--- a/git-web--browse.sh
+++ b/git-web--browse.sh
@@ -31,8 +31,8 @@ valid_custom_tool()
 
 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
@@ -104,12 +104,12 @@ fi
 
 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
-		browser_candidates="w3m links lynx"
+		browser_candidates="w3m elinks links lynx"
 	fi
 	# SECURITYSESSIONID indicates an OS X GUI login session
 	if test -n "$SECURITYSESSIONID" \
@@ -140,7 +140,7 @@ else
 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'
@@ -168,13 +168,13 @@ konqueror)
 		;;
 	esac
 	;;
-w3m|links|lynx|open)
+w3m|elinks|links|lynx|open)
 	eval "$browser_path" "$@"
 	;;
 start)
 	exec "$browser_path" '"web-browse"' "$@"
 	;;
-dillo)
+opera|dillo)
 	"$browser_path" "$@" &
 	;;
 *)
-- 
1.7.3.2.624.gec6c7.dirty

  parent reply	other threads:[~2010-11-29 14:48 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-29 14:47 [PATCH 0/6] web--browse cleanups and extensions Giuseppe Bilotta
2010-11-29 14:47 ` [PATCH 1/6] CodingGuidelines: mention whitespace preferences for shell scripts Giuseppe Bilotta
2010-11-30  0:30   ` Junio C Hamano
2010-11-30  8:11     ` Giuseppe Bilotta
2010-11-29 14:47 ` [PATCH 2/6] web--browse: coding style Giuseppe Bilotta
2010-11-29 14:47 ` [PATCH 3/6] web--browse: split valid_tool list Giuseppe Bilotta
2010-11-29 16:44   ` Jonathan Nieder
2010-11-29 19:19     ` Giuseppe Bilotta
2010-11-29 20:24     ` Junio C Hamano
2010-11-29 14:47 ` Giuseppe Bilotta [this message]
2010-11-29 14:47 ` [PATCH 5/6] web--browse: use (x-)www-browser if available Giuseppe Bilotta
2010-11-29 16:18   ` Christian Couder
2010-11-29 16:25     ` Christian Couder
2010-11-29 19:05     ` Giuseppe Bilotta
2010-11-30  4:02       ` Christian Couder
2010-11-30  8:22         ` Giuseppe Bilotta
2010-12-01 10:59           ` Christian Couder
2010-12-01 11:46             ` Giuseppe Bilotta
2010-12-01 15:49               ` Jonathan Nieder
2010-11-29 16:48   ` Jonathan Nieder
2010-11-29 19:16     ` Giuseppe Bilotta
2010-11-29 14:47 ` [PATCH 6/6] web--browse: special-case chromium path Giuseppe Bilotta

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1291042075-19983-5-git-send-email-giuseppe.bilotta@gmail.com \
    --to=giuseppe.bilotta@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).