You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jmeter.apache.org by ag...@apache.org on 2017/10/27 16:42:13 UTC

svn commit: r1813548 - /jmeter/trunk/bin/jmeter

Author: agomes
Date: Fri Oct 27 16:42:13 2017
New Revision: 1813548

URL: http://svn.apache.org/viewvc?rev=1813548&view=rev
Log:
Bug 61667 - Bad detection of Java home in bin/jmeter

Modified:
    jmeter/trunk/bin/jmeter

Modified: jmeter/trunk/bin/jmeter
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter?rev=1813548&r1=1813547&r2=1813548&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter (original)
+++ jmeter/trunk/bin/jmeter Fri Oct 27 16:42:13 2017
@@ -25,7 +25,7 @@
 ##   ==============================================
 # Make sure prerequisite environment variables are set
 if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
-  if $darwin; then
+  if [ "$(uname)" == "Darwin" ]; then
     # 
     if [ -x '/usr/libexec/java_home' ] ; then
       export JAVA_HOME=`/usr/libexec/java_home`
@@ -68,7 +68,7 @@ MINIMAL_VERSION=1.8.0
 
 _java=`type java | awk '{ print $ NF }'`
 CURRENT_VERSION=`"$_java" -version 2>&1 | awk -F'"' '/version/ {print $2}'`
-# Check if version is from OpenJDK, containing 1.${version}.x
+# Check if version is from OpenJDK or Oracle Hotspot JVM prior to 9 containing 1.${version}.x
 if [ ${#CURRENT_VERSION} -lt 1 ]; then
 	CURRENT_VERSION=`echo $CURRENT_VERSION | awk -F'.' '{ print $2 }'`
 else