diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-27 17:19:40 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-27 17:19:40 +0000 |
| commit | 7bf8e474d15414eda8520ba5258511d845ca6061 (patch) | |
| tree | 417d6cfc8946fce8e2f87fdf3ec964036abd495c /git-web--browse.sh | |
| parent | 45d74c4b0fe38218b4569a90da7102cf48d616c2 (diff) | |
| parent | e230c568c4b9a991e3175e5f65171a566fd8e39c (diff) | |
| download | git-7bf8e474d15414eda8520ba5258511d845ca6061.tar.gz | |
Merge tag 'v1.8.4' into baserock/morph
Git 1.8.4
Diffstat (limited to 'git-web--browse.sh')
| -rwxr-xr-x | git-web--browse.sh | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/git-web--browse.sh b/git-web--browse.sh index 1e827264b4..1d72ec760e 100755 --- a/git-web--browse.sh +++ b/git-web--browse.sh @@ -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 @@ -119,14 +120,18 @@ if test -z "$browser" ; then browser_candidates="w3m elinks links lynx" fi # SECURITYSESSIONID indicates an OS X GUI login session - if test -n "$SECURITYSESSIONID" \ - -o "$TERM_PROGRAM" = "Apple_Terminal" ; then + if test -n "$SECURITYSESSIONID" || test -n "$TERM_PROGRAM" + then browser_candidates="open $browser_candidates" fi # /bin/start indicates MinGW 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) |