jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1814345 - /jmeter/trunk/bin/jmeter
Date Sun, 05 Nov 2017 09:59:49 GMT
Author: fschumacher
Date: Sun Nov  5 09:59:48 2017
New Revision: 1814345

URL: http://svn.apache.org/viewvc?rev=1814345&view=rev
Log:
Use the same binary for version detection as the one we start.

Bugzilla Id: 61529

Modified:
    jmeter/trunk/bin/jmeter

Modified: jmeter/trunk/bin/jmeter
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter?rev=1814345&r1=1814344&r2=1814345&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter (original)
+++ jmeter/trunk/bin/jmeter Sun Nov  5 09:59:48 2017
@@ -69,9 +69,8 @@ ADD_MODS=
 # Minimal version to run JMeter
 MINIMAL_VERSION=8
 
-_java=`type java | awk '{ print $ NF }'`
 # Check if version is from OpenJDK or Oracle Hotspot JVM prior to 9 containing 1.${version}.x
-CURRENT_VERSION=`"$_java" -version 2>&1 | awk -F'"' '/version/ {gsub("^1[.]", "",
$2); gsub("[^0-9].*$", "", $2); print $2}'`
+CURRENT_VERSION=`"${JAVA_HOME}/bin/java" -version 2>&1 | awk -F'"' '/version/ {gsub("^1[.]",
"", $2); gsub("[^0-9].*$", "", $2); print $2}'`
 
 # Check if Java is present and the minimal version requirement
 if [ "$CURRENT_VERSION" -gt "$MINIMAL_VERSION" ]; then



Mime
View raw message