Merge pull request #1847 from kochigami/update-pepper-cross-to-use-ro…

…sdistro [naoqieus/cross] use $ROS_DISTRO instead of melodic when installing pepper_meshes to allow us to use ROS noetic for build cross environment
jsk-ros-pkg · Aug 6, 2023 · d6bf03c · d6bf03c
2 parents e59b800 + e273a11
commit d6bf03c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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