From c36279e536778c3581d9e180bac730d835fb984b Mon Sep 17 00:00:00 2001
From: Oleg Kalachev <okalachev@gmail.com>
Date: Wed, 9 Jun 2021 15:38:19 +0300
Subject: [PATCH] image: move examples to clover package

---
 builder/image-build.sh                               | 2 --
 builder/image-ros.sh                                 | 4 +++-
 {builder/assets => clover}/examples/flight.py        | 0
 {builder/assets => clover}/examples/flight_marker.py | 0
 {builder/assets => clover}/examples/get_telemetry.py | 0
 {builder/assets => clover}/examples/leds.py          | 0
 {builder/assets => clover}/examples/navigate_wait.py | 0
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename {builder/assets => clover}/examples/flight.py (100%)
 rename {builder/assets => clover}/examples/flight_marker.py (100%)
 rename {builder/assets => clover}/examples/get_telemetry.py (100%)
 rename {builder/assets => clover}/examples/leds.py (100%)
 rename {builder/assets => clover}/examples/navigate_wait.py (100%)

diff --git a/builder/image-build.sh b/builder/image-build.sh
index 082b01a7..7c26b2e5 100755
--- a/builder/image-build.sh
+++ b/builder/image-build.sh
@@ -105,8 +105,6 @@ ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/butterf
 ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/monkey.service' '/lib/systemd/system/'
 # software install
 ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-software.sh'
-# examples
-${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/examples' '/home/pi/'  # TODO: symlink?
 # network setup
 ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-network.sh'
 # avahi setup
diff --git a/builder/image-ros.sh b/builder/image-ros.sh
index b8016083..614e269d 100755
--- a/builder/image-ros.sh
+++ b/builder/image-ros.sh
@@ -113,6 +113,7 @@ my_travis_retry pip3 install -r /home/pi/catkin_ws/src/clover/clover/requirement
 source /opt/ros/${ROS_DISTRO}/setup.bash
 # Don't build simulation plugins for actual drone
 catkin_make -j2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCATKIN_BLACKLIST_PACKAGES=clover_gazebo_plugins
+source devel/setup.bash
 
 echo_stamp "Install clever package (for backwards compatibility)"
 cd /home/pi/catkin_ws/src/clover/builder/assets/clever
@@ -151,7 +152,8 @@ catkin_make run_tests #&& catkin_test_results
 echo_stamp "Change permissions for catkin_ws"
 chown -Rf pi:pi /home/pi/catkin_ws
 
-echo_stamp "Change permissions for examples"
+echo_stamp "Make \$HOME/examples symlink"
+ln -s "$(catkin_find clover examples --first-only)" /home/pi
 chown -Rf pi:pi /home/pi/examples
 
 echo_stamp "Setup ROS environment"
diff --git a/builder/assets/examples/flight.py b/clover/examples/flight.py
similarity index 100%
rename from builder/assets/examples/flight.py
rename to clover/examples/flight.py
diff --git a/builder/assets/examples/flight_marker.py b/clover/examples/flight_marker.py
similarity index 100%
rename from builder/assets/examples/flight_marker.py
rename to clover/examples/flight_marker.py
diff --git a/builder/assets/examples/get_telemetry.py b/clover/examples/get_telemetry.py
similarity index 100%
rename from builder/assets/examples/get_telemetry.py
rename to clover/examples/get_telemetry.py
diff --git a/builder/assets/examples/leds.py b/clover/examples/leds.py
similarity index 100%
rename from builder/assets/examples/leds.py
rename to clover/examples/leds.py
diff --git a/builder/assets/examples/navigate_wait.py b/clover/examples/navigate_wait.py
similarity index 100%
rename from builder/assets/examples/navigate_wait.py
rename to clover/examples/navigate_wait.py