From commits-return-8091-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Sun Nov 5 09:59:51 2017 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E2DC017862 for ; Sun, 5 Nov 2017 09:59:51 +0000 (UTC) Received: (qmail 51916 invoked by uid 500); 5 Nov 2017 09:59:51 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 51882 invoked by uid 500); 5 Nov 2017 09:59:51 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 51873 invoked by uid 99); 5 Nov 2017 09:59:51 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Nov 2017 09:59:51 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 91CD13A0158 for ; Sun, 5 Nov 2017 09:59:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1814345 - /jmeter/trunk/bin/jmeter Date: Sun, 05 Nov 2017 09:59:49 -0000 To: commits@jmeter.apache.org From: fschumacher@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20171105095950.91CD13A0158@svn01-us-west.apache.org> 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