Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9F00DD6AD for ; Mon, 4 Mar 2013 13:43:10 +0000 (UTC) Received: (qmail 84656 invoked by uid 500); 4 Mar 2013 13:43:05 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 84581 invoked by uid 500); 4 Mar 2013 13:43:05 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 82710 invoked by uid 99); 4 Mar 2013 13:43:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Mar 2013 13:43:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 113BE314567; Mon, 4 Mar 2013 13:43:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [19/44] git commit: refs/heads/marvin-refactor - debian / rpm: When building the classpath in the init script strip last semi-column Message-Id: <20130304134301.113BE314567@tyr.zones.apache.org> Date: Mon, 4 Mar 2013 13:43:01 +0000 (UTC) debian / rpm: When building the classpath in the init script strip last semi-column Remove the trailing : so we don't get them double in the classpath Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ee695ba2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ee695ba2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ee695ba2 Branch: refs/heads/marvin-refactor Commit: ee695ba2c861095bdb21aa3151d97f4e52eddb7b Parents: 24c974d Author: Wido den Hollander Authored: Fri Mar 1 16:45:40 2013 +0100 Committer: Wido den Hollander Committed: Fri Mar 1 16:47:05 2013 +0100 ---------------------------------------------------------------------- packaging/centos63/cloud-agent.rc | 2 +- packaging/debian/init/cloud-agent | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ee695ba2/packaging/centos63/cloud-agent.rc ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc index 152e61e..2379ac1 100755 --- a/packaging/centos63/cloud-agent.rc +++ b/packaging/centos63/cloud-agent.rc @@ -58,7 +58,7 @@ export JAVA_HOME SCP="" DCP="" -ACP=`ls /usr/share/cloudstack-agent/cloud-plugin-hypervisor-kvm-*.jar`":"`ls /usr/share/cloudstack-agent/lib/* | tr '\n' ':'` +ACP=`ls /usr/share/cloudstack-agent/cloud-plugin-hypervisor-kvm-*.jar`":"`ls /usr/share/cloudstack-agent/lib/* | tr '\n' ':' | sed s'/.$//'` JCP="/usr/share/java/commons-daemon.jar" # We need to append the JSVC daemon JAR to the classpath http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ee695ba2/packaging/debian/init/cloud-agent ---------------------------------------------------------------------- diff --git a/packaging/debian/init/cloud-agent b/packaging/debian/init/cloud-agent index c1b1b7f..2e436a9 100755 --- a/packaging/debian/init/cloud-agent +++ b/packaging/debian/init/cloud-agent @@ -55,7 +55,7 @@ for jdir in $JDK_DIRS; do done export JAVA_HOME -ACP=`ls /usr/share/cloudstack-agent/lib/* | tr '\n' ':'` +ACP=`ls /usr/share/cloudstack-agent/lib/* | tr '\n' ':' | sed s'/.$//'` # We need to append the JSVC daemon JAR to the classpath # AgentShell implements the JSVC daemon methods