This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.19.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.19.x by this push:
new 5dc0bf2492 fix double slash in path
5dc0bf2492 is described below
commit 5dc0bf2492afef5ef78816b27316499730e79b97
Author: JB Onofré <[email protected]>
AuthorDate: Mon Feb 24 11:18:18 2025 +0100
fix double slash in path
---
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 1ce051c6a3..130517c6a0 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -112,14 +112,14 @@ if [ -z "$ACTIVEMQ_USER_CLASSPATH" ] ; then
fi
# ActiveMQ Classpath configuration
-ACTIVEMQ_CLASSPATH="$ACTIVEMQ_BASE/../lib/:$ACTIVEMQ_USER_CLASSPATH"
+ACTIVEMQ_CLASSPATH="${ACTIVEMQ_BASE%/}/../lib/:$ACTIVEMQ_USER_CLASSPATH"
# Active MQ configuration directory
if [ -z "$ACTIVEMQ_CONF" ] ; then
# For backwards compat with old variables we let ACTIVEMQ_CONFIG_DIR set
ACTIVEMQ_CONF
if [ -z "$ACTIVEMQ_CONFIG_DIR" ] ; then
- ACTIVEMQ_CONF="$ACTIVEMQ_BASE/conf"
+ ACTIVEMQ_CONF="${ACTIVEMQ_BASE%/}/conf"
else
ACTIVEMQ_CONF="$ACTIVEMQ_CONFIG_DIR"
fi
@@ -140,14 +140,14 @@ if [ -z "$ACTIVEMQ_DATA" ] ; then
# For backwards compat with old variables we let ACTIVEMQ_DATA_DIR set
ACTIVEMQ_DATA
if [ -z "$ACTIVEMQ_DATA_DIR" ] ; then
- ACTIVEMQ_DATA="$ACTIVEMQ_BASE/data"
+ ACTIVEMQ_DATA="${ACTIVEMQ_BASE%/}/data"
else
ACTIVEMQ_DATA="$ACTIVEMQ_DATA_DIR"
fi
fi
if [ -z "$ACTIVEMQ_TMP" ] ; then
- ACTIVEMQ_TMP="$ACTIVEMQ_BASE/tmp"
+ ACTIVEMQ_TMP="${ACTIVEMQ_BASE%/}/tmp"
fi
if [ ! -d "$ACTIVEMQ_DATA" ]; then
@@ -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
@@ -314,8 +314,8 @@ invokeJar(){
TASK_TODO="$2"
RET="1"
- if [ ! -f "${ACTIVEMQ_HOME}/bin/activemq.jar" ];then
- echo "ERROR: '${ACTIVEMQ_HOME}/bin/activemq.jar' does not exist, define
ACTIVEMQ_HOME in the config"
+ if [ ! -f "${ACTIVEMQ_HOME%/}/bin/activemq.jar" ];then
+ echo "ERROR: '${ACTIVEMQ_HOME%/}/bin/activemq.jar' does not exist, define
ACTIVEMQ_HOME in the config"
exit 1
fi
@@ -371,7 +371,7 @@ 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 \"INFO: pidfile created : '${PIDFILE}' (pid
'\$APID')\";exit \$RET" $DOIT_POSTFIX
@@ -385,7 +385,7 @@ 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 \"INFO: pidfile created : '${PIDFILE}' (pid
'\$APID')\";exit \$RET" $DOIT_POSTFIX
@@ -417,7 +417,7 @@ invokeJar(){
-Dactivemq.data=\"${ACTIVEMQ_DATA}\" \
-Djolokia.conf=\"${JOLOKIA_CONF}\" \
$ACTIVEMQ_CYGWIN \
- -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS
--pid $SPID &
+ -jar \"${ACTIVEMQ_HOME%/}/bin/activemq.jar\" $COMMANDLINE_ARGS
--pid $SPID &
RET=\"\$?\"; APID=\"\$!\";
echo \$APID > \"${PIDFILE}.stop\"; exit \$RET" $DOIT_POSTFIX
RET="$?"
@@ -430,7 +430,7 @@ invokeJar(){
-Dactivemq.data=\"${ACTIVEMQ_DATA}\" \
-Djolokia.conf=\"${JOLOKIA_CONF}\" \
$ACTIVEMQ_CYGWIN \
- -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS
--pid $SPID &
+ -jar \"${ACTIVEMQ_HOME%/}/bin/activemq.jar\" $COMMANDLINE_ARGS
--pid $SPID &
RET=\"\$?\"; APID=\"\$!\";
echo \$APID > \"${PIDFILE}.stop\"; exit \$RET" $DOIT_POSTFIX
RET="$?"
@@ -460,7 +460,7 @@ invokeJar(){
-Dactivemq.data=\"${ACTIVEMQ_DATA}\" \
-Djolokia.conf=\"${JOLOKIA_CONF}\" \
$ACTIVEMQ_CYGWIN \
- -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS"
$DOIT_POSTFIX
+ -jar \"${ACTIVEMQ_HOME%/}/bin/activemq.jar\" $COMMANDLINE_ARGS"
$DOIT_POSTFIX
RET="$?"
else
$EXEC_OPTION $DOIT_PREFIX "\"$JAVACMD\" $ACTIVEMQ_OPTS
$ACTIVEMQ_DEBUG_OPTS \
@@ -471,7 +471,7 @@ invokeJar(){
-Dactivemq.data=\"${ACTIVEMQ_DATA}\" \
-Djolokia.conf=\"${JOLOKIA_CONF}\" \
$ACTIVEMQ_CYGWIN \
- -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS"
$DOIT_POSTFIX
+ -jar \"${ACTIVEMQ_HOME%/}/bin/activemq.jar\" $COMMANDLINE_ARGS"
$DOIT_POSTFIX
RET="$?"
fi
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
