Clean up after ourselves when building base boxes

boxes/build-debian-box.sh

@@ -157,4 +157,11 @@ sed -i "s/<TODAY>/${NOW}/" metadata.json
 # Vagrant box!
 tar -czf $PKG ./*
 
-echo "The base box was built successfully to ${WORKING_DIR}/${PKG}"
+chmod +rw ${WORKING_DIR}/${PKG}
+mkdir -p ${CWD}/output
+mv ${WORKING_DIR}/${PKG} ${CWD}/output
+
+# Clean up after ourselves
+rm -rf ${WORKING_DIR}
+
+echo "The base box was built successfully to ${CWD}/output/${PKG}"

boxes/build-ubuntu-box.sh

@@ -140,4 +140,12 @@ sed -i "s/<TODAY>/${NOW}/" metadata.json
 # Vagrant box!
 tar -czf $PKG ./*
 
-echo "The base box was built successfully to ${WORKING_DIR}/${PKG}"
+chmod +rw ${WORKING_DIR}/${PKG}
+mkdir -p ${CWD}/output
+mv ${WORKING_DIR}/${PKG} ${CWD}/output
+
+# Clean up after ourselves
+rm -rf ${WORKING_DIR}
+lxc-destroy -n ${RELEASE}-base
+
+echo "The base box was built successfully to ${CWD}/output/${PKG}"

boxes/common/install-babushka

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 rootfs=$1
 
 echo "installing babushka"

boxes/common/install-chef

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 rootfs=$1
 
 echo "installing chef"

boxes/common/install-puppet

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 rootfs=$1
 
 echo "installing puppet"

boxes/common/install-salt

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 rootfs=$1
 
 echo "installing salt"