From d9cd7c161bf4ea05155370a1063c6099a8565b0a Mon Sep 17 00:00:00 2001
From: sfalexrog <sfalexrog@gmail.com>
Date: Wed, 13 Feb 2019 21:14:18 +0300
Subject: [PATCH] builder: Copy checked out repo instead of re-cloning it

---
 builder/image-build.sh | 10 ++++++++++
 builder/image-ros.sh   |  4 +---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/builder/image-build.sh b/builder/image-build.sh
index 76f6787e..77f77adf 100755
--- a/builder/image-build.sh
+++ b/builder/image-build.sh
@@ -79,6 +79,16 @@ ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/init_rp
 ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/hardware_setup.sh' '/root/'
 ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-init.sh' ${IMAGE_VERSION} ${SOURCE_IMAGE}
 
+# Copy cloned repository to the image
+# Include dotfiles in globs (asterisks)
+shopt -s dotglob
+for dir in ${REPO_DIR}/*; do
+  # Don't try to copy image into itself
+  if [ $dir != 'images' ]; then
+    ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy $dir '/home/pi/catkin_ws/src/clever/'
+  fi;
+done
+
 # Monkey
 ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/monkey' '/root/'
 
diff --git a/builder/image-ros.sh b/builder/image-ros.sh
index 4114cc81..09718de7 100755
--- a/builder/image-ros.sh
+++ b/builder/image-ros.sh
@@ -136,10 +136,8 @@ if [ "${INSTALL_ROS_PACK_SOURCES}" = "true" ]; then
 fi
 
 echo_stamp "Installing CLEVER" \
-&& git clone ${REPO} /home/pi/catkin_ws/src/clever \
 && cd /home/pi/catkin_ws/src/clever \
-&& echo "REF: ${REF}" \
-&& git checkout ${REF} \
+&& git status \
 && cd /home/pi/catkin_ws \
 && resolve_rosdep $(pwd) \
 && my_travis_retry pip install wheel \