Refactor Jenkins plugin installation

1 files changed, 7 insertions, 5 deletions

diff --git a/vm-data/jenkins.customize b/vm-data/jenkins.customize
index bf5eb6e..dc34e40 100755
--- a/vm-data/jenkins.customize
+++ b/vm-data/jenkins.customize
@@ -55,11 +55,13 @@ chroot "$rootdir" apt-get install -y --no-remove jenkins
 umount "$rootdir/proc"
 
 # Install the Bazaar and Git plugins for Jenkins.
-old="$(pwd)"
-cd "$rootdir/var/lib/jenkins/plugins"
-wget --no-check-certificate http://updates.jenkins-ci.org/latest/bazaar.hpi
-wget --no-check-certificate http://updates.jenkins-ci.org/latest/git.hpi
-cd "$old"
+chroot "$rootdir" install -d -o jenkins -g jenkins "/var/lib/jenkins/plugins"
+for plugin in bazaar git
+do
+    wget --no-check-certificate \
+        -O "$rootdir/var/lib/jenkins/plugins/$plugin.hpi" \
+        "http://updates.jenkins-ci.org/latest/$plugin.hpi"
+done
 
 # Remove the policy-rc.d so that things do start when we boot into the system.
 rm "$rootdir/usr/sbin/policy-rc.d"