From e101e71e8bc4cace09c2e50ecc4773a5e5900c2f Mon Sep 17 00:00:00 2001
From: Arthur Golubtsov <goldartt@gmail.com>
Date: Fri, 4 Oct 2019 20:28:59 +0300
Subject: [PATCH] builder: Update builder scripts and clever-show service for
 compability with v0.18

---
 builder/assets/clever-show.service | 6 +++---
 builder/image-build.sh             | 5 +++--
 builder/image-software.sh          | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/builder/assets/clever-show.service b/builder/assets/clever-show.service
index c93c431..e1885e5 100644
--- a/builder/assets/clever-show.service
+++ b/builder/assets/clever-show.service
@@ -3,9 +3,9 @@ Description=Clever Show Client Service
 After=clever.service
 
 [Service]
-WorkingDirectory=/home/pi/CleverSwarm/Drone
-EnvironmentFile=/lib/systemd/system/roscore.env
-ExecStart=/usr/bin/python /home/pi/CleverSwarm/Drone/copter_client.py
+WorkingDirectory=/home/pi/clever-show/Drone
+ExecStart=/bin/bash -c ". /home/pi/catkin_ws/devel/setup.sh; \
+                      /usr/bin/python /home/pi/clever-show/Drone/copter_client.py"
 KillSignal=SIGKILL
 Restart=on-failure
 RestartSec=3
diff --git a/builder/image-build.sh b/builder/image-build.sh
index f541bc6..bb68595 100755
--- a/builder/image-build.sh
+++ b/builder/image-build.sh
@@ -41,6 +41,7 @@ if [[ -z ${TRAVIS_TAG} ]]; then IMAGE_VERSION="$(cd ${REPO_DIR}; git log --forma
 # IMAGE_VERSION="${TRAVIS_TAG:=$(cd ${REPO_DIR}; git log --format=%h -1)}"
 REPO_URL="$(cd ${REPO_DIR}; git remote --verbose | grep origin | grep fetch | cut -f2 | cut -d' ' -f1 | sed 's/git@github\.com\:/https\:\/\/github.com\//')"
 REPO_NAME="$(basename -s '.git' ${REPO_URL})"
+echo_stamp "REPO_NAME=${REPO_NAME}" "INFO"
 IMAGE_NAME="${REPO_NAME}_${IMAGE_VERSION}.img"
 echo_stamp "IMAGE_NAME=${IMAGE_NAME}" "INFO"
 IMAGE_PATH="${IMAGES_DIR}/${IMAGE_NAME}"
@@ -99,10 +100,10 @@ echo_stamp "Mount dirs ${MOUNT_POINT} & ${MOUNT_POINT}/boot"
 mount "${DEV_IMAGE}p2" ${MOUNT_POINT}
 mount "${DEV_IMAGE}p1" ${MOUNT_POINT}/boot
 
-mkdir -p ${MOUNT_POINT}'/home/pi/CleverSwarm/'
+mkdir -p ${MOUNT_POINT}'/home/pi/clever-show/'
 for dir in ${REPO_DIR}/*; do
   if [[ $dir != *"images" && $dir != *"imgcache" ]]; then
-    cp -r $dir ${MOUNT_POINT}'/home/pi/CleverSwarm/'$(basename $dir)
+    cp -r $dir ${MOUNT_POINT}'/home/pi/clever-show/'$(basename $dir)
   fi;
 done
 
diff --git a/builder/image-software.sh b/builder/image-software.sh
index 5a86bac..aea52ae 100755
--- a/builder/image-software.sh
+++ b/builder/image-software.sh
@@ -50,7 +50,7 @@ my_travis_retry() {
 }
 
 echo_stamp "Change repo owner to pi"
-chown -Rf pi:pi /home/pi/CleverSwarm/
+chown -Rf pi:pi /home/pi/clever-show/
 
 echo_stamp "Update apt cache"
 apt-get update -qq