mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
Merge branch 'ys/cygstart'
On Cygwin, recognize "cygstart" as a possible way to start a web browser (used in "help -w" and "instaweb" among others). * ys/cygstart: web--browse: support /usr/bin/cygstart on Cygwin
This commit is contained in:
commit
12dd2f6933
|
@ -34,6 +34,7 @@ The following browsers (or commands) are currently supported:
|
|||
* dillo
|
||||
* open (this is the default under Mac OS X GUI)
|
||||
* start (this is the default under MinGW)
|
||||
* cygstart (this is the default under Cygwin)
|
||||
|
||||
Custom commands may also be specified.
|
||||
|
||||
|
|
|
@ -32,8 +32,9 @@ valid_custom_tool()
|
|||
valid_tool() {
|
||||
case "$1" in
|
||||
firefox | iceweasel | seamonkey | iceape | \
|
||||
chrome | google-chrome | chromium | chromium-browser |\
|
||||
konqueror | opera | w3m | elinks | links | lynx | dillo | open | start)
|
||||
chrome | google-chrome | chromium | chromium-browser | \
|
||||
konqueror | opera | w3m | elinks | links | lynx | dillo | open | \
|
||||
start | cygstart)
|
||||
;; # happy
|
||||
*)
|
||||
valid_custom_tool "$1" || return 1
|
||||
|
@ -127,6 +128,10 @@ if test -z "$browser" ; then
|
|||
if test -x /bin/start; then
|
||||
browser_candidates="start $browser_candidates"
|
||||
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
|
||||
init_browser_path $i
|
||||
|
@ -174,7 +179,7 @@ konqueror)
|
|||
;;
|
||||
esac
|
||||
;;
|
||||
w3m|elinks|links|lynx|open)
|
||||
w3m|elinks|links|lynx|open|cygstart)
|
||||
"$browser_path" "$@"
|
||||
;;
|
||||
start)
|
||||
|
|
Loading…
Reference in a new issue