svn commit: r1734200 - /qpid/java/trunk/broker/bin/qpid-server

[kw...@apache.org]

Author: kwall
Date: Wed Mar  9 09:13:13 2016
New Revision: 1734200

URL: http://svn.apache.org/viewvc?rev=1734200&view=rev
Log:
QPID-7132: [Java Broker] Fix quoting of argument to dirname in qpid-server

* Also consistently brace variable references throughout the script.

Modified:
    qpid/java/trunk/broker/bin/qpid-server

Modified: qpid/java/trunk/broker/bin/qpid-server
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker/bin/qpid-server?rev=1734200&r1=1734199&r2=1734200&view=diff
==============================================================================
--- qpid/java/trunk/broker/bin/qpid-server (original)
+++ qpid/java/trunk/broker/bin/qpid-server Wed Mar  9 09:13:13 2016
@@ -17,36 +17,36 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-WHEREAMI=`dirname $0`
-if [ -z "$QPID_HOME" ]; then
-    export QPID_HOME=`cd $WHEREAMI/../ && pwd`
+WHEREAMI=`dirname "${0}"`
+if [ -z "${QPID_HOME}" ]; then
+    export QPID_HOME=`cd "${WHEREAMI}/../" && pwd`
 fi
 
-if [ -z "$QPID_WORK" ]; then
-    echo "Setting QPID_WORK to $HOME as default"
-    QPID_WORK=$HOME
+if [ -z "${QPID_WORK}" ]; then
+    echo "Setting QPID_WORK to ${HOME} as default"
+    QPID_WORK="${HOME}"
 fi
 
 # Set to help us get round the manifold problems of ps/pgrep on various
 # platforms which gather up to prevent qpid_stop from working .....
-if [ -z "$QPID_PNAME" ]; then
+if [ -z "${QPID_PNAME}" ]; then
     export QPID_PNAME=" -DPNAME=QPBRKR"
 fi
 
 # Set classpath to include the jars in lib/, lib/plugins, and lib/opt
-QPID_LIBS="$QPID_HOME/lib/*:$QPID_HOME/lib/plugins/*:$QPID_HOME/lib/opt/*"
+QPID_LIBS="${QPID_HOME}/lib/*:${QPID_HOME}/lib/plugins/*:${QPID_HOME}/lib/opt/*"
 
 # Set other variables used by the qpid-run script before calling
 export JAVA=java \
        JAVA_VM=-server \
        JAVA_MEM="-Xmx512m -XX:MaxDirectMemorySize=1536m" \
        JAVA_GC="-XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError" \
-       QPID_CLASSPATH=$QPID_LIBS \
+       QPID_CLASSPATH="${QPID_LIBS}" \
        QPID_RUN_LOG=2 
 
 # Echo the PID to file. Since qpid-run is sourced and uses exec to
 # launch the broker, this will give the brokers PID.
-if [ -z "$QPID_PID_FILENAME" ]; then
+if [ -z "${QPID_PID_FILENAME}" ]; then
     export QPID_PID_FILENAME="qpid-server.pid"
 fi
 echo $$ > "${QPID_WORK}/${QPID_PID_FILENAME}"



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org