Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 28711 invoked from network); 13 Apr 2011 18:02:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 Apr 2011 18:02:19 -0000 Received: (qmail 91979 invoked by uid 500); 13 Apr 2011 18:02:19 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 91926 invoked by uid 500); 13 Apr 2011 18:02:19 -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 91919 invoked by uid 99); 13 Apr 2011 18:02:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Apr 2011 18:02:19 +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; Wed, 13 Apr 2011 18:02:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E1C3423889B3; Wed, 13 Apr 2011 18:01:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1091864 - /activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala Date: Wed, 13 Apr 2011 18:01:57 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110413180157.E1C3423889B3@eris.apache.org> Author: chirino Date: Wed Apr 13 18:01:57 2011 New Revision: 1091864 URL: http://svn.apache.org/viewvc?rev=1091864&view=rev Log: Use canonical paths in the created scripts. Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala?rev=1091864&r1=1091863&r2=1091864&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala (original) +++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala Wed Apr 13 18:01:57 2011 @@ -120,11 +120,7 @@ class Create extends Action { val home = new File(System.getProperty("apollo.home")) - println("Make sure the following directory is on your path: ") - println("") - println(" %s/bin".format((home / "bin").getCanonicalPath)) - println("") - println("Then run the broker by executing: ") + println("Tou can now start the broker by executing: ") println("") println(" %s run".format((bin/"apollo-broker").getCanonicalPath)) println("") @@ -162,7 +158,8 @@ class Create extends Action { if( filter ) { content = content.replaceAll(Pattern.quote("${host}"), Matcher.quoteReplacement(host)) content = content.replaceAll(Pattern.quote("${version}"), Matcher.quoteReplacement(Broker.version)) - content = content.replaceAll(Pattern.quote("${home}"), Matcher.quoteReplacement(System.getProperty("apollo.home"))) + val home = new File(System.getProperty("apollo.home")) + content = content.replaceAll(Pattern.quote("${home}"), Matcher.quoteReplacement(home.getCanonicalPath)) } // and then writing out in the new target encoding.