update: automatically source devel/setup.bash

zshun-robot · May 24, 2021 · 908fb4e · 908fb4e
1 parent 6a5e947
commit 908fb4e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/scripts/rviz.sh b/scripts/rviz.sh
@@ -9,7 +9,7 @@
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"; pwd )"
 BASE_DIR="$( cd ${SCRIPT_DIR}/..; pwd )"
-TRAJ_GENERATOR_DIR="$(cd "${BASE_DIR}/map_tools/modules/trajectory_generator"; pwd)"
+TRAJ_GENERATOR_DIR="$( cd "${BASE_DIR}/map_tools/modules/trajectory_generator"; pwd )"
 RVIZ_CONFIG_FILE=${TRAJ_GENERATOR_DIR}/rviz/rviz_config_traj_gene.rviz
 
 

diff --git a/scripts/traj_generator.sh b/scripts/traj_generator.sh
@@ -3,13 +3,24 @@
  # @version: 
  # @Author: LitoNeo
  ###
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-BASE_DIR="cd "${SCRIPT_DIR}/.."; pwd"
-GRIDMAP_GENERATOR_DIR="cd "${BASE_DIR}/map_tools/grid_map_generator"; pwd"
-TRAJ_GENERATOR_DIR="cd "${BASE_DIR}/map_tools/trajectory_generator"; pwd"
+# set -x
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"; pwd )"
+BASE_DIR="$( cd ${SCRIPT_DIR}/..; pwd )"
+GRIDMAP_GENERATOR_DIR="$( cd "${BASE_DIR}/map_tools/modules/grid_map_generator"; pwd )"
+TRAJ_GENERATOR_DIR="$( cd "${BASE_DIR}/map_tools/modules/trajectory_generator"; pwd )"
 
 source "${SCRIPT_DIR}/smartcar_base.sh"
 
+CATKIN_DIR="$( cd ${BASE_DIR}/../..; pwd )"
+ENV_BASH_FILE="${CATKIN_DIR}/devel/setup.bash"
+if [ ! -f ${ENV_BASH_FILE} ];then
+    echo "${ENV_BASH_FILE} not found."
+    echo "Please build this project first"
+    exit 1
+fi
+source ${ENV_BASH_FILE}
+
 function start(){
     echo "Start roscore..."
     ${SCRIPT_DIR}/roscore.sh start
@@ -41,6 +52,6 @@ case $1 in
     stop
     ;;
   *)
-    echo "choose start or stop"
+    echo "choose start or stop argument"
     ;;
 esac