From 969702a9575ada3bcc510ce2e44cb00b8325ecaa Mon Sep 17 00:00:00 2001 From: Jay Soffian Date: Thu, 14 Feb 2008 03:36:14 -0500 Subject: [PATCH] git-help--browse: improve browser support under OS X /usr/bin/open is used under OS X to open a document as if the user had double-clicked on the file's icon (i.e. HTML files are opened w/the user's default browser). Signed-off-by: Jay Soffian Acked-by: Christian Couder Signed-off-by: Junio C Hamano --- git-help--browse.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/git-help--browse.sh b/git-help--browse.sh index 10b0a36a3d..84e37ef279 100755 --- a/git-help--browse.sh +++ b/git-help--browse.sh @@ -30,7 +30,7 @@ test -f "$html_dir/git.html" || die "No documentation directory found." valid_tool() { case "$1" in - firefox | iceweasel | konqueror | w3m | links | lynx | dillo) + firefox | iceweasel | konqueror | w3m | links | lynx | dillo | open) ;; # happy *) return 1 @@ -94,6 +94,10 @@ if test -z "$browser" ; then else browser_candidates="w3m links lynx" fi + # SECURITYSESSIONID indicates an OS X GUI login session + if test -n "$SECURITYSESSIONID"; then + browser_candidates="open $browser_candidates" + fi for i in $browser_candidates; do init_browser_path $i @@ -140,7 +144,7 @@ case "$browser" in ;; esac ;; - w3m|links|lynx) + w3m|links|lynx|open) eval "$browser_path" $pages ;; dillo) -- 2.11.4.GIT