tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From schu...@apache.org
Subject svn commit: r1430567 - /tomcat/trunk/bin/setclasspath.sh
Date Tue, 08 Jan 2013 22:05:47 GMT
Author: schultz
Date: Tue Jan  8 22:05:46 2013
New Revision: 1430567

URL: http://svn.apache.org/viewvc?rev=1430567&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54390
Use /usr/libexec/java_home to determine JAVA_HOME on Mac OS X if it is available.

Modified:
    tomcat/trunk/bin/setclasspath.sh

Modified: tomcat/trunk/bin/setclasspath.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?rev=1430567&r1=1430566&r2=1430567&view=diff
==============================================================================
--- tomcat/trunk/bin/setclasspath.sh (original)
+++ tomcat/trunk/bin/setclasspath.sh Tue Jan  8 22:05:46 2013
@@ -25,9 +25,12 @@
 
 # Make sure prerequisite environment variables are set
 if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
-  # Bugzilla 37284 (reviewed).
   if $darwin; then
-    if [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then
+    # Bugzilla 54390
+    if [ -x '/usr/libexec/java_home' ] ; then
+      export JAVA_HOME=`/usr/libexec/java_home`
+    # Bugzilla 37284 (reviewed).
+    elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then
       export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home"
     fi
   else



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message