incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [19/44] git commit: refs/heads/marvin-refactor - debian / rpm: When building the classpath in the init script strip last semi-column
Date Mon, 04 Mar 2013 13:43:01 GMT
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 <wido@widodh.nl>
Authored: Fri Mar 1 16:45:40 2013 +0100
Committer: Wido den Hollander <wido@widodh.nl>
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


Mime
View raw message