web--browse: support /usr/bin/cygstart on Cygwin
While both GUI and console Cygwin browsers do exist, anecdotal evidence suggests most users rely on their native Windows browser. cygstart, which is a long-standing part of the base Cygwin installation, will cause the page to be opened in the default Windows browser (the one registered to open .html files). Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
c0add3073a
commit
cc2f6b6865
|
@ -34,6 +34,7 @@ The following browsers (or commands) are currently supported:
|
||||||
* dillo
|
* dillo
|
||||||
* open (this is the default under Mac OS X GUI)
|
* open (this is the default under Mac OS X GUI)
|
||||||
* start (this is the default under MinGW)
|
* start (this is the default under MinGW)
|
||||||
|
* cygstart (this is the default under Cygwin)
|
||||||
|
|
||||||
Custom commands may also be specified.
|
Custom commands may also be specified.
|
||||||
|
|
||||||
|
|
|
@ -32,8 +32,9 @@ valid_custom_tool()
|
||||||
valid_tool() {
|
valid_tool() {
|
||||||
case "$1" in
|
case "$1" in
|
||||||
firefox | iceweasel | seamonkey | iceape | \
|
firefox | iceweasel | seamonkey | iceape | \
|
||||||
chrome | google-chrome | chromium | chromium-browser |\
|
chrome | google-chrome | chromium | chromium-browser | \
|
||||||
konqueror | opera | w3m | elinks | links | lynx | dillo | open | start)
|
konqueror | opera | w3m | elinks | links | lynx | dillo | open | \
|
||||||
|
start | cygstart)
|
||||||
;; # happy
|
;; # happy
|
||||||
*)
|
*)
|
||||||
valid_custom_tool "$1" || return 1
|
valid_custom_tool "$1" || return 1
|
||||||
|
@ -127,6 +128,10 @@ if test -z "$browser" ; then
|
||||||
if test -x /bin/start; then
|
if test -x /bin/start; then
|
||||||
browser_candidates="start $browser_candidates"
|
browser_candidates="start $browser_candidates"
|
||||||
fi
|
fi
|
||||||
|
# /usr/bin/cygstart indicates Cygwin
|
||||||
|
if test -x /usr/bin/cygstart; then
|
||||||
|
browser_candidates="cygstart $browser_candidates"
|
||||||
|
fi
|
||||||
|
|
||||||
for i in $browser_candidates; do
|
for i in $browser_candidates; do
|
||||||
init_browser_path $i
|
init_browser_path $i
|
||||||
|
@ -174,7 +179,7 @@ konqueror)
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
w3m|elinks|links|lynx|open)
|
w3m|elinks|links|lynx|open|cygstart)
|
||||||
"$browser_path" "$@"
|
"$browser_path" "$@"
|
||||||
;;
|
;;
|
||||||
start)
|
start)
|
||||||
|
|
Loading…
Reference in New Issue