jmeter-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Felix Schumacher <felix.schumac...@internetallee.de>
Subject Re: svn commit: r1814345 - /jmeter/trunk/bin/jmeter
Date Sun, 05 Nov 2017 10:56:50 GMT


Am 5. November 2017 11:26:32 MEZ schrieb Philippe Mouawad <philippe.mouawad@gmail.com>:
>Hi Felix,
>Are there the same number problems on windows jmeter.bat ?

Having no windows at hand and not being a windows guy, I really don't know. 

Felix

>
>Thanks
>
>On Sunday, November 5, 2017, <fschumacher@apache.org> wrote:
>
>> 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