You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2024/03/03 07:01:19 UTC
(activemq) branch activemq-5.18.x updated: AMQ-9434: Support space in ActiveMQ base directory
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.18.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.18.x by this push:
new b18ee64a6 AMQ-9434: Support space in ActiveMQ base directory
b18ee64a6 is described below
commit b18ee64a6f854e4f0351fd541a07cab907d2e933
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sun Mar 3 08:00:45 2024 +0100
AMQ-9434: Support space in ActiveMQ base directory
---
assembly/src/release/bin/activemq | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index 2786f49c8..5b85deebc 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -175,7 +175,7 @@ if ( basename $0 | grep "activemq-instance-" > /dev/null);then
ACTIVEMQ_CONFIGS="/etc/default/activemq-instance-${INST} $HOME/.activemqrc-instance-${INST}"
echo "INFO: Using alternative activemq configuration files: $ACTIVEMQ_CONFIGS"
else
- ACTIVEMQ_CONFIGS="/etc/default/activemq $HOME/.activemqrc $ACTIVEMQ_HOME/bin/env"
+ ACTIVEMQ_CONFIGS="/etc/default/activemq $HOME/.activemqrc \"$ACTIVEMQ_HOME\"/bin/env"
fi
# load activemq configuration
@@ -203,7 +203,7 @@ if [ "$CONFIG_LOAD" != "yes" ];then
fi
if [ -z "$ACTIVEMQ_OPTS" ] ; then
- ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config"
+ ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=\"$ACTIVEMQ_CONF\"/login.config"
fi
@@ -370,9 +370,9 @@ invokeJar(){
-Dactivemq.data=\"${ACTIVEMQ_DATA}\" \
-Djolokia.conf=\"${JOLOKIA_CONF}\" \
$ACTIVEMQ_CYGWIN \
- -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS >> $ACTIVEMQ_OUT 2>&1 &
+ -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS >> \"$ACTIVEMQ_OUT\" 2>&1 &
RET=\"\$?\"; APID=\"\$!\";
- echo \$APID > "${PIDFILE}";
+ echo \$APID > \"${PIDFILE}\";
echo \"INFO: pidfile created : '${PIDFILE}' (pid '\$APID')\";exit \$RET" $DOIT_POSTFIX
RET="$?"
else
@@ -384,9 +384,9 @@ invokeJar(){
-Dactivemq.data=\"${ACTIVEMQ_DATA}\" \
-Djolokia.conf=\"${JOLOKIA_CONF}\" \
$ACTIVEMQ_CYGWIN \
- -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS >> $ACTIVEMQ_OUT 2>&1 &
+ -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS >> \"$ACTIVEMQ_OUT\" 2>&1 &
RET=\"\$?\"; APID=\"\$!\";
- echo \$APID > "${PIDFILE}";
+ echo \$APID > \"${PIDFILE}\";
echo \"INFO: pidfile created : '${PIDFILE}' (pid '\$APID')\";exit \$RET" $DOIT_POSTFIX
RET="$?"
fi
@@ -417,7 +417,7 @@ invokeJar(){
$ACTIVEMQ_CYGWIN \
-jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS --pid $SPID &
RET=\"\$?\"; APID=\"\$!\";
- echo \$APID > "${PIDFILE}.stop"; exit \$RET" $DOIT_POSTFIX
+ echo \$APID > \"${PIDFILE}.stop\"; exit \$RET" $DOIT_POSTFIX
RET="$?"
else
$EXEC_OPTION $DOIT_PREFIX "\"$JAVACMD\" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \
@@ -430,7 +430,7 @@ invokeJar(){
$ACTIVEMQ_CYGWIN \
-jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS --pid $SPID &
RET=\"\$?\"; APID=\"\$!\";
- echo \$APID > "${PIDFILE}.stop"; exit \$RET" $DOIT_POSTFIX
+ echo \$APID > \"${PIDFILE}.stop\"; exit \$RET" $DOIT_POSTFIX
RET="$?"
fi
else
@@ -489,7 +489,7 @@ invokeJar(){
checkRunning(){
local pidfile="${1}"
- if [ -f $pidfile ]; then
+ if [ -f "$pidfile" ]; then
if [ -z "`cat "$pidfile"`" ];then
echo "ERROR: Pidfile '$pidfile' exists but contains no pid"
return 2
@@ -518,7 +518,7 @@ checkRunning(){
invoke_status(){
if ( checkRunning "$ACTIVEMQ_PIDFILE" );then
- PID="`cat $ACTIVEMQ_PIDFILE`"
+ PID="`cat \"$ACTIVEMQ_PIDFILE\"`"
echo "ActiveMQ is running (pid '$PID')"
exit 0
fi
@@ -539,7 +539,7 @@ invoke_status(){
invoke_start(){
if ( checkRunning "$ACTIVEMQ_PIDFILE" );then
- PID="`cat $ACTIVEMQ_PIDFILE`"
+ PID="`cat \"$ACTIVEMQ_PIDFILE\"`"
echo "INFO: Process with pid '$PID' is already running"
exit 0
fi
@@ -593,7 +593,7 @@ invoke_console(){
invoke_kill(){
if ( checkRunning "$ACTIVEMQ_PIDFILE" );then
- ACTIVEMQ_PID="`cat ${ACTIVEMQ_PIDFILE}`"
+ ACTIVEMQ_PID="`cat \"${ACTIVEMQ_PIDFILE}\"`"
echo "INFO: sending SIGKILL to pid '$ACTIVEMQ_PID'"
kill -KILL $ACTIVEMQ_PID
RET="$?"
@@ -620,7 +620,7 @@ invoke_stop(){
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $ACTIVEMQ_SSL_OPTS"
COMMANDLINE_ARGS="$COMMANDLINE_ARGS $ACTIVEMQ_SUNJMX_CONTROL"
- ACTIVEMQ_PID="`cat $ACTIVEMQ_PIDFILE`"
+ ACTIVEMQ_PID="`cat \"$ACTIVEMQ_PIDFILE\"`"
invokeJar "$ACTIVEMQ_PIDFILE" "stop"
RET="$?"