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 060C053FE for ; Thu, 12 May 2011 15:21:53 +0000 (UTC) Received: (qmail 77583 invoked by uid 500); 12 May 2011 15:21:53 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 77548 invoked by uid 500); 12 May 2011 15:21:52 -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 77541 invoked by uid 99); 12 May 2011 15:21:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 May 2011 15:21:52 +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, 12 May 2011 15:21:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D181D2388A36; Thu, 12 May 2011 15:21:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1102347 - /activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker-service Date: Thu, 12 May 2011 15:21:31 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110512152131.D181D2388A36@eris.apache.org> Author: chirino Date: Thu May 12 15:21:31 2011 New Revision: 1102347 URL: http://svn.apache.org/viewvc?rev=1102347&view=rev Log: Fixes https://issues.apache.org/jira/browse/AMQ-3317 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=1102347&r1=1102346&r2=1102347&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 12 15:21:31 2011 @@ -95,7 +95,7 @@ start() { return 1 fi - if [ -z "$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 &