undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ys/cygstart'

Browse Source 
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:
Junio C Hamano 2013-06-26 15:08:01 -07:00
commit 12dd2f6933
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/git-web--browse.txt
View File

@ -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.

11
git-web--browse.sh
View File

@ -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)