Skip to content

Commit ee695ba

Browse files
committed
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
1 parent 24c974d commit ee695ba

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

packaging/centos63/cloud-agent.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export JAVA_HOME
5858

5959
SCP=""
6060
DCP=""
61-
ACP=`ls /usr/share/cloudstack-agent/cloud-plugin-hypervisor-kvm-*.jar`":"`ls /usr/share/cloudstack-agent/lib/* | tr '\n' ':'`
61+
ACP=`ls /usr/share/cloudstack-agent/cloud-plugin-hypervisor-kvm-*.jar`":"`ls /usr/share/cloudstack-agent/lib/* | tr '\n' ':' | sed s'/.$//'`
6262
JCP="/usr/share/java/commons-daemon.jar"
6363

6464
# We need to append the JSVC daemon JAR to the classpath

packaging/debian/init/cloud-agent

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ for jdir in $JDK_DIRS; do
5555
done
5656
export JAVA_HOME
5757

58-
ACP=`ls /usr/share/cloudstack-agent/lib/* | tr '\n' ':'`
58+
ACP=`ls /usr/share/cloudstack-agent/lib/* | tr '\n' ':' | sed s'/.$//'`
5959

6060
# We need to append the JSVC daemon JAR to the classpath
6161
# AgentShell implements the JSVC daemon methods

0 commit comments

Comments
 (0)