Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 228C74367 for ; Thu, 19 May 2011 13:04:07 +0000 (UTC) Received: (qmail 39530 invoked by uid 500); 19 May 2011 13:04:07 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 39504 invoked by uid 500); 19 May 2011 13:04:07 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 39497 invoked by uid 99); 19 May 2011 13:04:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 May 2011 13:04:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 May 2011 13:04:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AE3452388993; Thu, 19 May 2011 13:03:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1124729 - /activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker-service Date: Thu, 19 May 2011 13:03:45 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110519130345.AE3452388993@eris.apache.org> Author: chirino Date: Thu May 19 13:03:45 2011 New Revision: 1124729 URL: http://svn.apache.org/viewvc?rev=1124729&view=rev Log: Applying Lionel Cons's cleanup patch. Thanks! Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker-service Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker-service URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker-service?rev=1124729&r1=1124728&r2=1124729&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker-service (original) +++ activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker-service Thu May 19 13:03:45 2011 @@ -65,7 +65,7 @@ status() { if [ $? -eq 0 ] ; then return 1 else - rm ${PID_FILE} + rm "${PID_FILE}" fi fi return 0 @@ -83,7 +83,7 @@ stop() { fi sleep 1 done - echo Could not stop process ${pid} + echo "Could not stop process ${pid}" return 1 } @@ -95,7 +95,7 @@ start() { return 1 fi - if [ -z "$APOLLO_USER" -o `id -un` == "$APOLLO_USER" ] ; then + if [ -z "$APOLLO_USER" -o `id -un` = "$APOLLO_USER" ] ; then nohup ${APOLLO_BASE}/bin/apollo-broker run > /dev/null 2> /dev/null & else sudo -n -u ${APOLLO_USER} nohup ${APOLLO_BASE}/bin/apollo-broker run > /dev/null 2> /dev/null & @@ -110,6 +110,7 @@ start() { echo "Could not start ${service}" return 1 fi + echo "${service} is now running (${pid})" return 0 } @@ -144,7 +145,7 @@ case $1 in if [ $? -eq 0 ] ; then echo "${service} is stopped" else - echo "${service} is running" + echo "${service} is running (${pid})" fi exit 0 ;; @@ -152,4 +153,5 @@ case $1 in *) echo "Usage: $0 {start|stop|restart|force-stop|status}" >&2 exit 2 + ;; esac \ No newline at end of file