From e815c14070999f8fbfbec1ac854c1f54cc989e87 Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Wed, 10 Oct 2018 13:23:58 +0300 Subject: [PATCH] image: Replace True to true, False to false --- builder/image-build.sh | 2 +- builder/image-ros.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/builder/image-build.sh b/builder/image-build.sh index 84d2fa37..db3b3d33 100755 --- a/builder/image-build.sh +++ b/builder/image-build.sh @@ -100,6 +100,6 @@ ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/roscore ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/roscore.service' '/root/' ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/kinetic-rosdep-clever.yaml' '/etc/ros/rosdep/' # ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/kinetic-ros-clever.rosinstall' '/home/pi/ros_catkin_ws/' -${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-ros.sh' ${REPO_URL} ${IMAGE_VERSION} False False ${NUMBER_THREADS} +${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-ros.sh' ${REPO_URL} ${IMAGE_VERSION} false false ${NUMBER_THREADS} ${BUILDER_DIR}/image-resize.sh ${IMAGE_PATH} diff --git a/builder/image-ros.sh b/builder/image-ros.sh index ee9dc9e9..28b8fe41 100755 --- a/builder/image-ros.sh +++ b/builder/image-ros.sh @@ -68,10 +68,10 @@ resolve_rosdep() { || (echo_stamp "Rosdep installation was failed!" "ERROR"; exit 1) } -INSTALL_ROS_PACK_SOURCES=${INSTALL_ROS_PACK_SOURCES:='False'} -if [ "${INSTALL_ROS_PACK_SOURCES}" = "True" ]; then - DISCOVER_ROS_PACK=${DISCOVER_ROS_PACK:='True'} - if [ "${DISCOVER_ROS_PACK}" = "False" ]; then +INSTALL_ROS_PACK_SOURCES=${INSTALL_ROS_PACK_SOURCES:='false'} +if [ "${INSTALL_ROS_PACK_SOURCES}" = "true" ]; then + DISCOVER_ROS_PACK=${DISCOVER_ROS_PACK:='true'} + if [ "${DISCOVER_ROS_PACK}" = "false" ]; then echo_stamp "Preparing ros_comm packages to kinetic-ros_comm-wet.rosinstall" \ && mkdir -p /home/pi/ros_catkin_ws && cd /home/pi/ros_catkin_ws \ && rosinstall_generator ros_comm --rosdistro kinetic --deps --wet-only --tar > kinetic-ros_comm-wet.rosinstall \