Skip to content

Commit bf415fd

Browse files
author
R. Tyler Croy
committed
Merge pull request #163 from mark0n/fixCLIpath
Fix broken path for CLI jar file on Debian
2 parents f45dc97 + d38cd3e commit bf415fd

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

manifests/cli.pp

+12-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,18 @@
88
fail("Use of private class ${name} by ${caller_module_name}")
99
}
1010

11-
$jar = '/usr/lib/jenkins/jenkins-cli.jar'
12-
$extract_jar = 'unzip /usr/lib/jenkins/jenkins.war WEB-INF/jenkins-cli.jar'
11+
case $::osfamily {
12+
'Debian': {
13+
$war = '/usr/share/jenkins/jenkins.war'
14+
$jar = '/usr/share/jenkins/jenkins-cli.jar'
15+
}
16+
default: {
17+
$war = '/usr/lib/jenkins/jenkins.war'
18+
$jar = '/usr/lib/jenkins/jenkins-cli.jar'
19+
}
20+
}
21+
22+
$extract_jar = "unzip ${war} WEB-INF/jenkins-cli.jar"
1323
$move_jar = "mv WEB-INF/jenkins-cli.jar ${jar}"
1424
$remove_dir = 'rm -rf WEB-INF'
1525

0 commit comments

Comments
 (0)