From 4a0d5c412e2bee6f4c72e0194fa5959cf94e5fb3 Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Wed, 15 Feb 2012 15:29:22 +0000 Subject: QPID-3840: corrected qpid-passwd and qpid-run to handle paths with spaces in them. Modified unit test to capture stderr to aid diagnosis of failures. Applied patch from Andrew MacBean and Philip Harvey git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1244535 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/broker/bin/qpid-passwd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qpid/java/broker') diff --git a/qpid/java/broker/bin/qpid-passwd b/qpid/java/broker/bin/qpid-passwd index f432e00ab8..69246974fa 100755 --- a/qpid/java/broker/bin/qpid-passwd +++ b/qpid/java/broker/bin/qpid-passwd @@ -18,9 +18,9 @@ # under the License. # -WHEREAMI=`dirname $0` if [ -z "$QPID_HOME" ]; then - export QPID_HOME=`cd $WHEREAMI/../ && pwd` + WHEREAMI=`dirname "$0"` + export QPID_HOME=`cd "$WHEREAMI/../" && pwd` fi # Set classpath to include Qpid jar with all required jars in manifest @@ -32,4 +32,4 @@ export JAVA=java \ JAVA_MEM=-Xmx1024m \ QPID_CLASSPATH=$QPID_LIBS -. ${QPID_HOME}/bin/qpid-run org.apache.qpid.tools.security.Passwd "$@" +. "${QPID_HOME}/bin/qpid-run" org.apache.qpid.tools.security.Passwd "$@" -- cgit v1.2.1