From: Heiko Voigt <hvoigt@hvoigt.net>
Date: Mon, 14 Sep 2009 08:49:01 +0000 (+0200)
Subject: web--browse: fix Mac OS X GUI detection for 10.6
X-Git-Tag: v1.6.5-rc2~31
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=20f34902d154f390ebaa7eed7f42ad14140b8acb;p=git.git

web--browse: fix Mac OS X GUI detection for 10.6

Since OS X 10.6 the variable $SECURITYSESSIONID does not exist anymore,
so lets look for the $TERM_PROGRAM variable as backup.

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-web--browse.sh b/git-web--browse.sh
index 4f5c740df..a578c3a73 100755
--- a/git-web--browse.sh
+++ b/git-web--browse.sh
@@ -111,7 +111,8 @@ if test -z "$browser" ; then
 	browser_candidates="w3m links lynx"
     fi
     # SECURITYSESSIONID indicates an OS X GUI login session
-    if test -n "$SECURITYSESSIONID"; then
+    if test -n "$SECURITYSESSIONID" \
+	    -o "$TERM_PROGRAM" = "Apple_Terminal" ; then
 	browser_candidates="open $browser_candidates"
     fi
     # /bin/start indicates MinGW