From ee695ba2c861095bdb21aa3151d97f4e52eddb7b Mon Sep 17 00:00:00 2001 From: Wido den Hollander Date: Fri, 1 Mar 2013 16:45:40 +0100 Subject: [PATCH] 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 --- packaging/centos63/cloud-agent.rc | 2 +- packaging/debian/init/cloud-agent | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc index 152e61e4ac7..2379ac1f334 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 diff --git a/packaging/debian/init/cloud-agent b/packaging/debian/init/cloud-agent index c1b1b7f6c5c..2e436a90892 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