diff options
| author | Keith Wall <kwall@apache.org> | 2012-02-15 15:29:22 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2012-02-15 15:29:22 +0000 |
| commit | ceca332cd78cb9c990c8c67d131970f8015700a2 (patch) | |
| tree | e1aa9c4d1ba1a74de415de43805b57a7cfcb482a /java/broker/bin | |
| parent | e9f31d216bd6655fa0fb9728411dbe5e0f0a7778 (diff) | |
| download | qpid-python-ceca332cd78cb9c990c8c67d131970f8015700a2.tar.gz | |
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 <andymacbean@gmail.com> and Philip Harvey <phil@philharveyonline.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1244535 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/bin')
| -rwxr-xr-x | java/broker/bin/qpid-passwd | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/broker/bin/qpid-passwd b/java/broker/bin/qpid-passwd index f432e00ab8..69246974fa 100755 --- a/java/broker/bin/qpid-passwd +++ b/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 "$@" |