Author: dejanb
Date: Fri Nov 12 11:41:43 2010
New Revision: 1034352
URL: http://svn.apache.org/viewvc?rev=1034352&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2453 - additional portability
improvements
Modified:
activemq/trunk/assembly/src/release/bin/activemq
Modified: activemq/trunk/assembly/src/release/bin/activemq
URL:
http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq?rev=1034352&r1=1034351&r2=1034352&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq (original)
+++ activemq/trunk/assembly/src/release/bin/activemq Fri Nov 12 11:41:43 2010
@@ -361,7 +361,7 @@ invokeJar(){
echo \$APID > $PIDFILE;
echo \"INFO: pidfile created : '$PIDFILE' (pid '\$APID')\";exit
\$RET" $DOIT_POSTFIX
RET="$?"
- elif [ -n "$PIDFILE" ] && [ "$PIDFILE" == "stop" ];then
+ elif [ -n "$PIDFILE" ] && [ "$PIDFILE" = "stop" ];then
$DOIT_PREFIX "$JAVACMD $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \
-Dactivemq.classpath=\"${ACTIVEMQ_CLASSPATH}\" \
-Dactivemq.home=\"${ACTIVEMQ_HOME}\" \
@@ -513,7 +513,7 @@ invoke_stop(){
COMMANDLINE_ARGS="$COMMANDLINE_ARGS $ACTIVEMQ_SUNJMX_CONTROL"
invokeJar "stop"
RET="$?"
- echo -n "INFO: Waiting at least $ACTIVEMQ_KILL_MAXSECONDS seconds for
regular process termination of pid '$(cat $ACTIVEMQ_PIDFILE)' : "
+ echo "INFO: Waiting at least $ACTIVEMQ_KILL_MAXSECONDS seconds for
regular process termination of pid '$(cat $ACTIVEMQ_PIDFILE)' : \c"
FOUND="0"
i=1
while [ $i != $ACTIVEMQ_KILL_MAXSECONDS ]; do
