From a7fff0ffc408b4a091aecdecdc412ec930c83330 Mon Sep 17 00:00:00 2001
From: Arthur Golubtsov <goldartt@gmail.com>
Date: Wed, 23 Oct 2019 18:30:06 +0300
Subject: [PATCH] Fix checking out in build

---
 builder/image-build.sh    | 4 +---
 builder/image-software.sh | 5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/builder/image-build.sh b/builder/image-build.sh
index beea3618..c879a7f4 100755
--- a/builder/image-build.sh
+++ b/builder/image-build.sh
@@ -79,11 +79,9 @@ img-resize ${IMAGE_PATH} max '5G'
 # Checkout to tag's branch if built with travis tag
 if [[ ! -z ${TRAVIS_TAG} ]]; then
   cd ${REPO_DIR}
-  echo_stamp "Checkout to master from ${TRAVIS_TAG}" "INFO"
+  echo_stamp "Checkout to origin/pinocchio_work from ${TRAVIS_TAG}" "INFO"
   git fetch
   git checkout --track origin/pinocchio_work
-  git checkout master
-  git checkout pinocchio_work -- Drone/client_config.ini
   cd /
 fi
 
diff --git a/builder/image-software.sh b/builder/image-software.sh
index b7395503..08731ac7 100755
--- a/builder/image-software.sh
+++ b/builder/image-software.sh
@@ -73,6 +73,11 @@ catkin_make --pkg clever_flight_routines
 catkin_make aruco_pose
 source devel/setup.bash
 
+echo_stamp "Checkout clever-show to master, but fetch config from pinocchio_work"
+cd /home/pi/clever-show
+git checkout master
+git checkout pinocchio_work -- Drone/client_config.ini
+
 echo_stamp "Change clever-show and catkin_ws owner to pi"
 chown -Rf pi:pi /home/pi/clever-show/
 chown -Rf pi:pi /home/pi/catkin_ws/