Better builds

run.sh

@@ -93,13 +93,14 @@ if [ ! -r "${ovf}" ]; then
     -var username="${username}" \
     -var password="${password}" \
     packer/ovf.json
+  rmdir packer_cache #normally empty
 else
   echo "Skipping stage 2: [$(basename ${ovf})] exists. Remove to force rebuild."
 fi
 
 exit 1
 
-if [ ! -r "${ovf2}" ]; then
+if [ ! -r "${ova}" ]; then
   echo "Stage 3: [$(basename ${ovf})] -> provision -> [$(basename ${ova})]"
   cd ovf_to_ovf && \
   packer build \
@@ -113,7 +114,8 @@ if [ ! -r "${ovf2}" ]; then
     -var username="${username}" \
     -var password="${password}" \
     -var provisioning_delay=30 \
-    template.json
+    packer/provision.json
+  rmdir packer_cache #normally empty
 else
   echo "Skipping stage 3: [$(basename ${ova})] exists. Remove to force rebuild."
 fi