git-help--browse: improve browser support under OS X
/usr/bin/open <document> 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 <jaysoffian@gmail.com> Acked-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d5558581d2
commit
969702a957
@ -30,7 +30,7 @@ test -f "$html_dir/git.html" || die "No documentation directory found."
|
|||||||
|
|
||||||
valid_tool() {
|
valid_tool() {
|
||||||
case "$1" in
|
case "$1" in
|
||||||
firefox | iceweasel | konqueror | w3m | links | lynx | dillo)
|
firefox | iceweasel | konqueror | w3m | links | lynx | dillo | open)
|
||||||
;; # happy
|
;; # happy
|
||||||
*)
|
*)
|
||||||
return 1
|
return 1
|
||||||
@ -94,6 +94,10 @@ if test -z "$browser" ; then
|
|||||||
else
|
else
|
||||||
browser_candidates="w3m links lynx"
|
browser_candidates="w3m links lynx"
|
||||||
fi
|
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
|
for i in $browser_candidates; do
|
||||||
init_browser_path $i
|
init_browser_path $i
|
||||||
@ -140,7 +144,7 @@ case "$browser" in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
w3m|links|lynx)
|
w3m|links|lynx|open)
|
||||||
eval "$browser_path" $pages
|
eval "$browser_path" $pages
|
||||||
;;
|
;;
|
||||||
dillo)
|
dillo)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user