From c9e38c69e8178f61930b77f241b6265e4830d447 Mon Sep 17 00:00:00 2001
From: David Halls <dahalls@gmail.com>
Date: Tue, 29 Mar 2016 21:19:46 +0100
Subject: [PATCH] Leave .built

---
 .travis-ci/build.sh                | 2 +-
 aboriginal_scripts/build_heddle.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis-ci/build.sh b/.travis-ci/build.sh
index 271f5d2..f867ef0 100755
--- a/.travis-ci/build.sh
+++ b/.travis-ci/build.sh
@@ -22,7 +22,7 @@ if ! build >& "../$logf"; then
 fi
 cd ..
 tail -n 100 "$logf"
-sudo rm -rf /tmp/chroot/home/source
+find /tmp/chroot/home/source -mindepth 1 -maxdepth 1 -not -name '*.built' -exec sudo rm -rf {} +
 df -h
 mkdir /tmp/home
 # mount home without recursive bind to get rid of its xroot bind mounts
diff --git a/aboriginal_scripts/build_heddle.sh b/aboriginal_scripts/build_heddle.sh
index fe31409..ad862c4 100755
--- a/aboriginal_scripts/build_heddle.sh
+++ b/aboriginal_scripts/build_heddle.sh
@@ -103,8 +103,8 @@ if [ -n "$chroot_build" ]; then
   cp -r --remove-destination "$OVERLAY_DIR/." "$ROOT_DIR"
   sudo mount -o bind "$ROOT_DIR" /tmp/chroot
   sudo mount -o remount,ro /tmp/chroot
-  if [ -d /tmp/heddle_home ]; then
-    sudo mount -o bind /tmp/heddle_home /tmp/chroot/home
+  if [ -d "$HERE/../home"  ]; then
+    sudo mount -o bind "$HERE/../home" /tmp/chroot/home
   else
     sudo mount -o loop "$HDB" /tmp/chroot/home
   fi