[jmeter] branch master updated: Shell scripts fail if space in JAVA_HOME path

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new 9ddf0d9  Shell scripts fail if space in JAVA_HOME path
9ddf0d9 is described below

commit 9ddf0d961b9edfb09dfc95c0e6569f8559e0e860
Author: Felix Schumacher <felix.schumac...@internetallee.de>
AuthorDate: Thu Dec 26 16:14:50 2019 +0100

    Shell scripts fail if space in JAVA_HOME path
    
    Contributed by ray7219
    
    Bugzilla Id: 64034
---
 bin/jmeter        | 4 ++--
 bin/jmeter.sh     | 4 ++--
 xdocs/changes.xml | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bin/jmeter b/bin/jmeter
index 4ef8ca7..5d5b949 100755
--- a/bin/jmeter
+++ b/bin/jmeter
@@ -88,8 +88,8 @@ if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
   else
     JAVA_PATH=`which java 2>/dev/null`
     if [ "x$JAVA_PATH" != "x" ]; then
-      JAVA_PATH=`dirname $JAVA_PATH 2>/dev/null`
-      JRE_HOME=`dirname $JAVA_PATH 2>/dev/null`
+      JAVA_PATH=`dirname "$JAVA_PATH" 2>/dev/null`
+      JRE_HOME=`dirname "$JAVA_PATH" 2>/dev/null`
     fi
     if [ "x$JRE_HOME" = "x" ]; then
       # XXX: Should we try other locations?
diff --git a/bin/jmeter.sh b/bin/jmeter.sh
index 46e9f0b..64fbce0 100755
--- a/bin/jmeter.sh
+++ b/bin/jmeter.sh
@@ -58,8 +58,8 @@ if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
   else
     JAVA_PATH=`which java 2>/dev/null`
     if [ "x$JAVA_PATH" != "x" ]; then
-      JAVA_PATH=`dirname $JAVA_PATH 2>/dev/null`
-      JRE_HOME=`dirname $JAVA_PATH 2>/dev/null`
+      JAVA_PATH=`dirname "$JAVA_PATH" 2>/dev/null`
+      JRE_HOME=`dirname "$JAVA_PATH" 2>/dev/null`
     fi
     if [ "x$JRE_HOME" = "x" ]; then
       # XXX: Should we try other locations?
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 1bf9335..6ae9194 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -167,6 +167,7 @@ to view the last release notes of version 5.2.1.
 <h3>General</h3>
 <ul>
   <li><bug>63945</bug>NPE when opening a file after file system change</li>
+  <li><bug>64034</bug>Shell scripts fail if space in JAVA_HOME path. 
Contributed by ray7219 (ray7219 at hotmail.com)</li>
 </ul>
 
  <!--  =================== Thanks =================== -->
@@ -177,6 +178,7 @@ to view the last release notes of version 5.2.1.
 <ul>
   <li>Stefan Seide (stefan at trilobyte-se.de)</li>
   <li>jmetertea</li>
+  <li>ray7219</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>