Merge lp:~fginther/charms/trusty/jenkins-remote-slave/fix-shell into lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk

Proposed by Francis Ginther
Status: Merged
Merged at revision: 17
Proposed branch: lp:~fginther/charms/trusty/jenkins-remote-slave/fix-shell
Merge into: lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
Diff against target: 21 lines (+2/-2)
1 file modified
hooks/install (+2/-2)
To merge this branch: bzr merge lp:~fginther/charms/trusty/jenkins-remote-slave/fix-shell
Reviewer Review Type Date Requested Status
Paul Larson Approve
Review via email: mp+238365@code.launchpad.net

Commit message

Fix a couple shell errors inside the install hook.

Description of the change

Fix a couple shell errors inside the install hook.

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/install'
2--- hooks/install 2014-10-06 13:49:54 +0000
3+++ hooks/install 2014-10-14 22:12:59 +0000
4@@ -8,7 +8,7 @@
5 # Install the slave if it is not installed already.
6 install_slave () {
7 juju-log "Installing jenkins-slave..."
8- if [[ ! -f "/etc/init/jenkins-slave-remote-${slave_name}.conf" ]]
9+ if [ ! -f "/etc/init/jenkins-slave-remote-${slave_name}.conf" ]
10 then
11 # Install the same slave package as the precise Jenkins master.
12 # Always install from the in-charm deb so that the modifications
13@@ -27,7 +27,7 @@
14 sed -i -e "/stop on/arespawn\nrespawn limit 10 5" \
15 -e "s!jenkins-slave!jenkins-slave-remote-${slave_name}!g" \
16 "/etc/init/jenkins-slave-remote-${slave_name}.conf"
17- install "/etc/default/jenkins-slave /etc/default/jenkins-slave-remote-${slave_name}"
18+ install "/etc/default/jenkins-slave" "/etc/default/jenkins-slave-remote-${slave_name}"
19 sed -i -e "s!^JENKINS_HOSTNAME.*!JENKINS_HOSTNAME=${slave_name}!" \
20 -e "s!^#*JENKINS_URL.*!JENKINS_URL=${master_url}!" \
21 -e "s!jenkins-slave!jenkins-slave-remote-${slave_name}!" \

Subscribers

People subscribed via source and target branches