From a3c13e0fbe5d328ad97e95511428c7724e82500a Mon Sep 17 00:00:00 2001 From: Anthony Lamping Date: Wed, 2 May 2018 14:51:05 -0400 Subject: [PATCH] tools: cleanup setup for gazebo env vars --- Tools/setup_gazebo.bash | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Tools/setup_gazebo.bash b/Tools/setup_gazebo.bash index ace73d44d3..f11cc26218 100755 --- a/Tools/setup_gazebo.bash +++ b/Tools/setup_gazebo.bash @@ -7,10 +7,8 @@ # # License: according to LICENSE.md in the root directory of the PX4 Firmware repository -if [ "$#" != 2 ] -then - echo usage: source setup_gazebo.bash src_dir build_dir - echo "" +if [ "$#" != 2 ]; then + echo -e "usage: source setup_gazebo.bash src_dir build_dir\n" return 1 fi @@ -18,11 +16,10 @@ SRC_DIR=$1 BUILD_DIR=$2 # setup Gazebo env and update package path -export GAZEBO_PLUGIN_PATH=${BUILD_DIR}/build_gazebo:${GAZEBO_PLUGIN_PATH} -export GAZEBO_MODEL_PATH=${GAZEBO_MODEL_PATH}:${SRC_DIR}/Tools/sitl_gazebo/models -# Disabling the remote model download seems only necessary with Gazebo 6 -#export GAZEBO_MODEL_DATABASE_URI="" -export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${SRC_DIR}/Tools/sitl_gazebo/Build/msgs/:${BUILD_DIR}/build_gazebo +export GAZEBO_PLUGIN_PATH=$GAZEBO_PLUGIN_PATH:${BUILD_DIR}/build_gazebo +export GAZEBO_MODEL_PATH=$GAZEBO_MODEL_PATH:${SRC_DIR}/Tools/sitl_gazebo/models +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${BUILD_DIR}/build_gazebo + echo -e "GAZEBO_PLUGIN_PATH $GAZEBO_PLUGIN_PATH" echo -e "GAZEBO_MODEL_PATH $GAZEBO_MODEL_PATH" echo -e "LD_LIBRARY_PATH $LD_LIBRARY_PATH"