You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/08/26 13:07:21 UTC
svn commit: r1806293 - in /jmeter/trunk: bin/heapdump.sh bin/mirror-server
bin/mirror-server.sh bin/shutdown.sh bin/stoptest.sh extras/proxycert.sh
xdocs/changes.xml
Author: pmouawad
Date: Sat Aug 26 13:07:21 2017
New Revision: 1806293
URL: http://svn.apache.org/viewvc?rev=1806293&view=rev
Log:
Bug 61399 - Make some bin and extras scripts Shellcheck compatible
This closes #304
Contributed by Wolfgang Wagner
Bugzilla Id: 61399
Modified:
jmeter/trunk/bin/heapdump.sh
jmeter/trunk/bin/mirror-server
jmeter/trunk/bin/mirror-server.sh
jmeter/trunk/bin/shutdown.sh
jmeter/trunk/bin/stoptest.sh
jmeter/trunk/extras/proxycert.sh
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/bin/heapdump.sh
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/heapdump.sh?rev=1806293&r1=1806292&r2=1806293&view=diff
==============================================================================
--- jmeter/trunk/bin/heapdump.sh (original)
+++ jmeter/trunk/bin/heapdump.sh Sat Aug 26 13:07:21 2017
@@ -19,6 +19,6 @@
# P1 = command port for JMeter instance (defaults to 4445)
-DIRNAME=`dirname $0`
+DIRNAME="$(dirname "$0")"
-java -cp ${DIRNAME}/ApacheJMeter.jar org.apache.jmeter.util.ShutdownClient HeapDump "$@"
+java -cp "${DIRNAME}/ApacheJMeter.jar" org.apache.jmeter.util.ShutdownClient HeapDump "$@"
Modified: jmeter/trunk/bin/mirror-server
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/mirror-server?rev=1806293&r1=1806292&r2=1806293&view=diff
==============================================================================
--- jmeter/trunk/bin/mirror-server (original)
+++ jmeter/trunk/bin/mirror-server Sat Aug 26 13:07:21 2017
@@ -1,6 +1,6 @@
#!/bin/sh
-exec $0.sh "$@"
+exec "$0.sh" "$@"
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
Modified: jmeter/trunk/bin/mirror-server.sh
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/mirror-server.sh?rev=1806293&r1=1806292&r2=1806293&view=diff
==============================================================================
--- jmeter/trunk/bin/mirror-server.sh (original)
+++ jmeter/trunk/bin/mirror-server.sh Sat Aug 26 13:07:21 2017
@@ -18,7 +18,7 @@
# Run the JMeter mirror server in non-GUI mode
# P1 = port to use (default 8080)
-cd `dirname $0`
+cd "$(dirname "$0")" || exit 1
CP=../lib/ext/ApacheJMeter_http.jar:../lib/ext/ApacheJMeter_core.jar:../lib/jorphan.jar:../lib/oro-2.0.8.jar
CP=${CP}:../lib/slf4j-api-1.7.25.jar:../lib/jcl-over-slf4j-1.7.25.jar:../lib/log4j-slf4j-impl-2.8.2.jar
Modified: jmeter/trunk/bin/shutdown.sh
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/shutdown.sh?rev=1806293&r1=1806292&r2=1806293&view=diff
==============================================================================
--- jmeter/trunk/bin/shutdown.sh (original)
+++ jmeter/trunk/bin/shutdown.sh Sat Aug 26 13:07:21 2017
@@ -19,6 +19,6 @@
# P1 = command port for JMeter instance (defaults to 4445)
-DIRNAME=`dirname $0`
+DIRNAME="$(dirname "$0")"
-java -cp ${DIRNAME}/ApacheJMeter.jar org.apache.jmeter.util.ShutdownClient Shutdown "$@"
+java -cp "${DIRNAME}/ApacheJMeter.jar" org.apache.jmeter.util.ShutdownClient Shutdown "$@"
Modified: jmeter/trunk/bin/stoptest.sh
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/stoptest.sh?rev=1806293&r1=1806292&r2=1806293&view=diff
==============================================================================
--- jmeter/trunk/bin/stoptest.sh (original)
+++ jmeter/trunk/bin/stoptest.sh Sat Aug 26 13:07:21 2017
@@ -19,6 +19,6 @@
# P1 = command port for JMeter instance (defaults to 4445)
-DIRNAME=`dirname $0`
+DIRNAME="$(dirname "$0")"
-java -cp ${DIRNAME}/ApacheJMeter.jar org.apache.jmeter.util.ShutdownClient StopTestNow "$@"
+java -cp "${DIRNAME}/ApacheJMeter.jar" org.apache.jmeter.util.ShutdownClient StopTestNow "$@"
Modified: jmeter/trunk/extras/proxycert.sh
URL: http://svn.apache.org/viewvc/jmeter/trunk/extras/proxycert.sh?rev=1806293&r1=1806292&r2=1806293&view=diff
==============================================================================
--- jmeter/trunk/extras/proxycert.sh (original)
+++ jmeter/trunk/extras/proxycert.sh Sat Aug 26 13:07:21 2017
@@ -35,7 +35,7 @@ STOREPASSWORD=password
KEYPASSWORD=password
## generate the keystore with the certificate
-keytool -genkeypair -alias jmeter -keystore ${KEYSTORE} -keypass ${KEYPASSWORD} -storepass ${STOREPASSWORD} -validity ${VALIDITY} -keyalg RSA -dname "${DNAME}"
+keytool -genkeypair -alias jmeter -keystore ${KEYSTORE} -keypass ${KEYPASSWORD} -storepass ${STOREPASSWORD} -validity "${VALIDITY}" -keyalg RSA -dname "${DNAME}"
## show the contents
keytool -list -v -keystore ${KEYSTORE} -storepass ${STOREPASSWORD}
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1806293&r1=1806292&r2=1806293&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Aug 26 13:07:21 2017
@@ -141,6 +141,7 @@ Incorporated feed back about unclear doc
<li>When looking for classes in <code>ActionRouter</code>, fall back to location of the jar,
where <code>ActionRouter</code> is loaded from. Provided by Emilian Bold (emi at apache.org)</li>
<li>Set 'Max Number of Connections' to 0 into 'JDBC Connection Configuration' for the 'JDBC Load Test template'</li>
+ <li><bug>61399</bug>Make some bin and extras scripts Shellcheck compatible. Contributed by Wolfgang Wagner (internetwolf2000 at hotmail.com)</li>
</ul>
<ch_section>Non-functional changes</ch_section>
@@ -243,6 +244,7 @@ Incorporated feed back about unclear doc
<li>Emilian Bold (emi at apache.org)</li>
<li>Liu XP (liu_xp2003 at sina.com)</li>
<li><a href="http://ubikloadpack.com">Ubik Load Pack</a></li>
+<li>Wolfgang Wagner (internetwolf2000 at hotmail.com)</li>
</ul>
<p>We also thank bug reporters who helped us improve JMeter. <br/>
For this release we want to give special thanks to the following reporters for the clear reports and tests made after our fixes:</p>