diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-03 09:34:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-03 09:34:37 -0700 |
| commit | ed23f31bbe370eee92a06900b898a969efb80d31 (patch) | |
| tree | 2b0c1b8080e5ddfd693485d5f354697804a331f5 | |
| parent | b9c78e97237df7df45549d29755e51b4a0fdc5ea (diff) | |
| parent | be537e43ca8c6e38a3cf7024b28d6daf54611132 (diff) | |
| download | git-ed23f31bbe370eee92a06900b898a969efb80d31.tar.gz | |
Merge branch 'js/iterm-is-on-osx'
Add more logic to detect graphic environment of OS X by simply
checking TERM_PROGRAM has some value, not Apple_Terminal, to detect
iTerm.app and any other.
* js/iterm-is-on-osx:
git-web--browse: recognize any TERM_PROGRAM as a GUI terminal on OS X
| -rwxr-xr-x | git-web--browse.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-web--browse.sh b/git-web--browse.sh index 1e827264b4..9f446798d4 100755 --- a/git-web--browse.sh +++ b/git-web--browse.sh @@ -119,8 +119,8 @@ 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 |