diff options
| author | Robert Gemmell <robbie@apache.org> | 2011-09-30 13:38:14 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2011-09-30 13:38:14 +0000 |
| commit | d63afde285bdfdf1c0ba6229f3d9ba424e16ea15 (patch) | |
| tree | 6d496c4e81ee8f5ea4d64bd71a1f6cb1564ab9ae | |
| parent | c6a295b5d8f7a8689e285d2280e02e59fb108206 (diff) | |
| download | qpid-python-d63afde285bdfdf1c0ba6229f3d9ba424e16ea15.tar.gz | |
QPID-3515: update qpid-server and qpid-run to enable them to work if QPID_HOME and QPID_WORK contain spaces and parentheses
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1177657 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | qpid/java/broker/bin/qpid-server | 4 | ||||
| -rwxr-xr-x | qpid/java/common/bin/qpid-run | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server index 8814824e66..382004c9f5 100755 --- a/qpid/java/broker/bin/qpid-server +++ b/qpid/java/broker/bin/qpid-server @@ -51,6 +51,6 @@ QPID_OPTS="$QPID_OPTS -Damqj.read_write_pool_size=32 -DQPID_LOG_APPEND=$QPID_LOG if [ -z "$QPID_PID_FILENAME" ]; then export QPID_PID_FILENAME="qpid-server.pid" fi -echo $$ > ${QPID_WORK}/${QPID_PID_FILENAME} +echo $$ > "${QPID_WORK}/${QPID_PID_FILENAME}" -. ${QPID_HOME}/bin/qpid-run org.apache.qpid.server.Main "$@" +. "${QPID_HOME}/bin/qpid-run" org.apache.qpid.server.Main "$@" diff --git a/qpid/java/common/bin/qpid-run b/qpid/java/common/bin/qpid-run index 15d88992df..ef4363e88b 100755 --- a/qpid/java/common/bin/qpid-run +++ b/qpid/java/common/bin/qpid-run @@ -77,7 +77,10 @@ fi #Set the default system properties that we'll use now that they have #all been initialised -SYSTEM_PROPS="-Damqj.logging.level=$AMQJ_LOGGING_LEVEL -DQPID_HOME=$QPID_HOME -DQPID_WORK=$QPID_WORK" +declare -a SYSTEM_PROPS +SYSTEM_PROPS[${#SYSTEM_PROPS[@]}]="-Damqj.logging.level=$AMQJ_LOGGING_LEVEL" +SYSTEM_PROPS[${#SYSTEM_PROPS[@]}]="-DQPID_HOME=$QPID_HOME" +SYSTEM_PROPS[${#SYSTEM_PROPS[@]}]="-DQPID_WORK=$QPID_WORK" #If logprefix or logsuffix set to use PID make that happen #Otherwise just pass the value through for these props @@ -90,7 +93,7 @@ if [ -n "$QPID_LOG_PREFIX" ]; then log $INFO Using qpid logprefix property LOG_PREFIX=" -Dlogprefix=$QPID_LOG_PREFIX" fi - SYSTEM_PROPS="${SYSTEM_PROPS} ${LOG_PREFIX}" + SYSTEM_PROPS[${#SYSTEM_PROPS[@]}]="${LOG_PREFIX}" fi if [ -n "$QPID_LOG_SUFFIX" ]; then @@ -101,10 +104,10 @@ if [ -n "$QPID_LOG_SUFFIX" ]; then log $INFO Using qpig logsuffix property LOG_SUFFIX=" -Dlogsuffix=$QPID_LOG_SUFFIX" fi - SYSTEM_PROPS="${SYSTEM_PROPS} ${LOG_SUFFIX}" + SYSTEM_PROPS[${#SYSTEM_PROPS[@]}]="${LOG_SUFFIX}" fi -log $INFO System Properties set to $SYSTEM_PROPS +log $INFO System Properties set to ${SYSTEM_PROPS[@]} log $INFO QPID_OPTS set to $QPID_OPTS program=$(basename $0) @@ -254,6 +257,6 @@ if $cygwin; then JAVA=$(cygpath -u $JAVA) fi -COMMAND=($JAVA $JAVA_VM $QPID_PNAME $JAVA_GC $JAVA_MEM $SYSTEM_PROPS $JAVA_OPTS $QPID_OPTS "${JAVA_ARGS[@]}") +COMMAND=($JAVA $JAVA_VM $QPID_PNAME $JAVA_GC $JAVA_MEM "${SYSTEM_PROPS[@]}" $JAVA_OPTS $QPID_OPTS "${JAVA_ARGS[@]}") DISPATCH |