Author: schultz
Date: Tue Jan 8 22:08:57 2013
New Revision: 1430568
URL: http://svn.apache.org/viewvc?rev=1430568&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54390
Back-port r1430567:
Use /usr/libexec/java_home to determine JAVA_HOME on Mac OS X if it is
available.
Modified:
tomcat/tc7.0.x/trunk/bin/setclasspath.sh
Modified: tomcat/tc7.0.x/trunk/bin/setclasspath.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/setclasspath.sh?rev=1430568&r1=1430567&r2=1430568&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/setclasspath.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/setclasspath.sh Tue Jan 8 22:08:57 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: [email protected]
For additional commands, e-mail: [email protected]
