[jsk_tools/test/env_hooks] Update test sh

jsk-ros-pkg · Jun 1, 2022 · 4e4236f · 4e4236f
1 parent 9bdccc4
commit 4e4236f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/jsk_tools/test/sh/rossetip.sh b/jsk_tools/test/sh/rossetip.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
-_THIS_DIR=$(builtin cd "`dirname "${BASH_SOURCE[0]}"`" > /dev/null && pwd)
-source $_THIS_DIR/../../env-hooks/99.jsk_tools.bash
+JSK_TOOLS_PATH=$(rospack find jsk_tools)
+if [ "$JSK_TOOLS_PATH" = "/opt/ros/${ROS_DISTRO}/share/jsk_tools" ]; then
+    source /opt/ros/${ROS_DISTRO}/setup.bash
+else
+    source `catkin locate --shell-verbs`
+    cd $(rospack find jsk_tools) && source $(catkin locate)/devel/etc/catkin/profile.d/99.jsk-tools.sh
+fi
 
 ECHO_OUTPUT="$1"
 ip() {

diff --git a/jsk_tools/test/sh/rossetmaster.sh b/jsk_tools/test/sh/rossetmaster.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
-_THIS_DIR=$(builtin cd "`dirname "${BASH_SOURCE[0]}"`" > /dev/null && pwd)
-source $_THIS_DIR/../../env-hooks/99.jsk_tools.bash
+JSK_TOOLS_PATH=$(rospack find jsk_tools)
+if [ "$JSK_TOOLS_PATH" = "/opt/ros/${ROS_DISTRO}/share/jsk_tools" ]; then
+    source /opt/ros/${ROS_DISTRO}/setup.bash
+else
+    source `catkin locate --shell-verbs`
+    cd $(rospack find jsk_tools) && source $(catkin locate)/devel/etc/catkin/profile.d/99.jsk-tools.sh
+fi
 
 rossetmaster "$1" "${2-11311}" > /dev/null 2>&1
 echo $ROS_MASTER_URI