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..976056ac 100755 --- a/builder/image-ros.sh +++ b/builder/image-ros.sh @@ -151,7 +151,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