From e273a11231450da3ac5082f94b551512c987da4a Mon Sep 17 00:00:00 2001 From: Kanae Kochigami Date: Fri, 4 Aug 2023 12:35:42 +0900 Subject: [PATCH] [naoqieus/cross] use $ROS_DISTRO instead of melodic when installing pepper_meshes to allow us to use ROS noetic for build cross environment --- jsk_naoqi_robot/cross/build_user.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jsk_naoqi_robot/cross/build_user.sh b/jsk_naoqi_robot/cross/build_user.sh index 3a4cac1afd..8e56a4a01b 100755 --- a/jsk_naoqi_robot/cross/build_user.sh +++ b/jsk_naoqi_robot/cross/build_user.sh @@ -43,13 +43,13 @@ done # force copy pepper_meshes if [ ! -e ${SOURCE_ROOT}/src/pepper_meshes/meshes ]; then - if [ ! -e /opt/ros/melodic/share/pepper_meshes/meshes/ ]; then + if [ ! -e /opt/ros/$ROS_DISTRO/share/pepper_meshes/meshes/ ]; then set +x - echo "ERROR: You need /opt/ros/melodic/share/pepper_meshes/meshes/ " 1>&2 - echo "ERROR: run apt 'install ros-melodic-pepper-meshes'" 1>&2 + echo "ERROR: You need /opt/ros/$ROS_DISTRO/share/pepper_meshes/meshes/ " 1>&2 + echo "ERROR: run apt 'install ros-$ROS_DISTRO-pepper-meshes'" 1>&2 exit -1 fi - cp -r /opt/ros/melodic/share/pepper_meshes/meshes/ ${SOURCE_ROOT}/src/pepper_meshes/ + cp -r /opt/ros/$ROS_DISTRO/share/pepper_meshes/meshes/ ${SOURCE_ROOT}/src/pepper_meshes/ fi ## UPDATE_SOURCE_ROOT=1 # TRUE