You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by rj...@apache.org on 2015/02/20 06:15:13 UTC
svn commit: r1661060 - in /jmeter/trunk: bin/jmeter bin/jmeter.sh
xdocs/changes.xml
Author: rjung
Date: Fri Feb 20 05:15:13 2015
New Revision: 1661060
URL: http://svn.apache.org/r1661060
Log:
Bug 57608 - Java version check in bin/jmeter script
in 2.12 fails on Solaris 10
Bugzilla Id: 57608
Modified:
jmeter/trunk/bin/jmeter
jmeter/trunk/bin/jmeter.sh
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/bin/jmeter
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter?rev=1661060&r1=1661059&r2=1661060&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter (original)
+++ jmeter/trunk/bin/jmeter Fri Feb 20 05:15:13 2015
@@ -29,9 +29,9 @@ MINIMAL_VERSION=1.6.0
# Check if Java is present and the minimal version requierement
_java=`type java | awk '{ print $ NF }'`
-CURRENT_VERSION=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $2}')
-minimal_version=$(echo $MINIMAL_VERSION | awk -F'.' '{ print $2 }')
-current_version=$(echo $CURRENT_VERSION | awk -F'.' '{ print $2 }')
+CURRENT_VERSION=`"$_java" -version 2>&1 | awk -F'"' '/version/ {print $2}'`
+minimal_version=`echo $MINIMAL_VERSION | awk -F'.' '{ print $2 }'`
+current_version=`echo $CURRENT_VERSION | awk -F'.' '{ print $2 }'`
if [ $current_version ]; then
if [ $current_version -lt $minimal_version ]; then
echo "Error: Java version is too low to run JMeter. Needs at least Java >= ${MINIMAL_VERSION}."
@@ -43,7 +43,7 @@ if [ $current_version ]; then
fi
JMETER_OPTS=""
-case $(uname) in
+case `uname` in
Darwin*)
# Add Mac-specific property - should be ignored elsewhere (Bug 47064)
JMETER_OPTS="-Xdock:name=JMeter -Xdock:icon="`dirname $0`/../docs/images/logo.jpg" -Dapple.laf.useScreenMenuBar=true -Dapple.eawt.quitStrategy=CLOSE_ALL_WINDOWS"
Modified: jmeter/trunk/bin/jmeter.sh
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.sh?rev=1661060&r1=1661059&r2=1661060&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.sh (original)
+++ jmeter/trunk/bin/jmeter.sh Fri Feb 20 05:15:13 2015
@@ -32,9 +32,9 @@ MINIMAL_VERSION=1.6.0
# Check if Java is present and the minimal version requierement
_java=`type java | awk '{ print $ NF }'`
-CURRENT_VERSION=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $2}')
-minimal_version=$(echo $MINIMAL_VERSION | awk -F'.' '{ print $2 }')
-current_version=$(echo $CURRENT_VERSION | awk -F'.' '{ print $2 }')
+CURRENT_VERSION=`"$_java" -version 2>&1 | awk -F'"' '/version/ {print $2}'`
+minimal_version=`echo $MINIMAL_VERSION | awk -F'.' '{ print $2 }'`
+current_version=`echo $CURRENT_VERSION | awk -F'.' '{ print $2 }'`
if [ $current_version ]; then
if [ $current_version -lt $minimal_version ]; then
echo "Error: Java version is too low to run JMeter. Needs at least Java >= ${MINIMAL_VERSION}."
@@ -46,7 +46,7 @@ if [ $current_version ]; then
fi
JMETER_OPTS=""
-case $(uname) in
+case `uname` in
Darwin*)
# Add Mac-specific property - should be ignored elsewhere (Bug 47064)
JMETER_OPTS="-Xdock:name=JMeter -Xdock:icon="`dirname $0`/../docs/images/logo.jpg" -Dapple.laf.useScreenMenuBar=true -Dapple.eawt.quitStrategy=CLOSE_ALL_WINDOWS"
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1661060&r1=1661059&r2=1661060&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Feb 20 05:15:13 2015
@@ -187,6 +187,7 @@ See <bugzilla>56357</bugzilla> for deta
<li><bug>57440</bug>OutOfMemoryError after introduction of JSyntaxTextArea in LoggerPanel due to disableUndo not being taken into account.</li>
<li><bug>57569</bug>FileServer.reserveFile - inconsistent behaviour when hasHeader is true</li>
<li><bug>57555</bug>Cannot use JMeter 2.12 as a maven dependency. Contributed by Pascal Schumacher (pascal.schumacher at t-systems.com)</li>
+<li><bug>57608</bug>Fix start script compatibility with old Unix shells, e.g. on Solaris</li>
</ul>
<!-- =================== Improvements =================== -->