[ros1] more env var fixes

tue-robotics · Apr 29, 2024 · ac02ddb · ac02ddb
1 parent d9a8728
commit ac02ddb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ros1/install.bash b/ros1/install.bash
@@ -1,6 +1,7 @@
 #! /usr/bin/env bash
 # shellcheck disable=SC1090
 
+# TODO(anyone): remove when tue-env is updated to new variable names
 if [[ ! -v TUE_ENV_ROS_DISTRO && -v TUE_ROS_DISTRO ]]
 then
     TUE_ENV_ROS_DISTRO=${TUE_ROS_DISTRO}
@@ -28,9 +29,12 @@ then
     touch "$rosdep_update_file"
 fi
 
+# TODO(anyone): remove when tue-env is updated to new variable names
+[[ -v TUE_ENV_WS_DIR || ! -v TUE_WS_DIR ]] || TUE_ENV_WS_DIR=${TUE_WS_DIR}
+
 mkdir -p "${TUE_ENV_WS_DIR}"
 
-if [ ! -f "${TUE_ENV_WS_DIR}"/devel/setup.bash ]
+if [[ ! -f "${TUE_ENV_WS_DIR}"/devel/setup.bash ]]
 then
     [[ -z "${TUE_ENV_ROS_VERSION}" ]] && { tue-install-warning "tue-env variable TUE_ENV_ROS_VERSION is not set. This will not be allowed in the future.\nSetting TUE_ENV_ROS_VERSION=1 temporarily."; }
     [[ "$CI" == "true" ]] && status_args=" --no-status"

diff --git a/ros1/setup b/ros1/setup
@@ -1,5 +1,6 @@
 #! /usr/bin/env bash
 
+# TODO(anyone): remove when tue-env is updated to new variable names
 if [[ ! -v TUE_ENV_ROS_DISTRO && -v TUE_ROS_DISTRO ]]
 then
     TUE_ENV_ROS_DISTRO=${TUE_ROS_DISTRO}
@@ -11,7 +12,10 @@ then
     return 1
 fi
 
-if [ -f "${TUE_ENV_WS_DIR}"/devel/setup.bash ]
+# TODO(anyone): remove when tue-env is updated to new variable names
+[[ -v TUE_ENV_WS_DIR || ! -v TUE_WS_DIR ]] || TUE_ENV_WS_DIR=${TUE_WS_DIR}
+
+if [[ -f "${TUE_ENV_WS_DIR}"/devel/setup.bash ]]
 then
     # shellcheck disable=SC1091
     source "${TUE_ENV_WS_DIR}"/devel/setup.bash