From commits-return-14574-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Tue Sep 07 08:56:24 2010
Return-Path: <commits-return-14574-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 83437 invoked from network); 7 Sep 2010 08:56:23 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 7 Sep 2010 08:56:23 -0000
Received: (qmail 37858 invoked by uid 500); 7 Sep 2010 08:56:23 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 37793 invoked by uid 500); 7 Sep 2010 08:56:21 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 37785 invoked by uid 99); 7 Sep 2010 08:56:20 -0000
Received: from Unknown (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Sep 2010 08:56:20 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 07 Sep 2010 08:56:03 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id F3D0C23889E7; Tue,  7 Sep 2010 08:55:41 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r993286 - /activemq/trunk/assembly/src/release/bin/activemq
Date: Tue, 07 Sep 2010 08:55:41 -0000
To: commits@activemq.apache.org
From: dejanb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100907085541.F3D0C23889E7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dejanb
Date: Tue Sep  7 08:55:41 2010
New Revision: 993286

URL: http://svn.apache.org/viewvc?rev=993286&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2898 - grep on solaris

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=993286&r1=993285&r2=993286&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq (original)
+++ activemq/trunk/assembly/src/release/bin/activemq Tue Sep  7 08:55:41 2010
@@ -35,7 +35,7 @@ ACTIVEMQ_CONFIGS="/etc/default/activemq 
 COMMANDLINE_ARGS="$@"
 
 # For using instances
-if ( basename $0 | grep -q "activemq-instance-" );then
+if ( basename $0 | grep "activemq-instance-" > /dev/null);then
    INST="$(basename $0|sed 's/^activemq-instance-//;s/\.sh$//')"
    ACTIVEMQ_CONFIGS="/etc/default/activemq-instance-${INST} $HOME/.activemqrc-instance-${INST}"
    echo "INFO: Using alternative activemq configuration files: $ACCTIVEMQ_CONFIGS"