(bootstrap) use curly brackets for vars

Author: MatthijsBurgh

installer/bootstrap.bash

@@ -31,9 +31,9 @@ installed_or_install virtualenv python3-virtualenv
 DISTRIB_ID="$(lsb_release -si)"
 DISTRIB_RELEASE="$(lsb_release -sr)"
 
-if [ "$DISTRIB_ID" != "Ubuntu" ]
+if [ "${DISTRIB_ID}" != "Ubuntu" ]
 then
-    echo "[bootstrap] Unsupported OS $DISTRIB_ID. Use Ubuntu."
+    echo "[bootstrap] Unsupported OS ${DISTRIB_ID}. Use Ubuntu."
     exit 1
 fi
 
@@ -63,7 +63,7 @@ do
     esac
 done
 
-case $DISTRIB_RELEASE in
+case ${DISTRIB_RELEASE} in
     "20.04")
         if [[ "${ros_version}" -eq 2 ]]
         then
@@ -123,7 +123,7 @@ case $DISTRIB_RELEASE in
         fi
         ;;
     *)
-        echo "[tue-env](bootstrap) Ubuntu $DISTRIB_RELEASE is unsupported. Please use one of Ubuntu 20.04 or 22.04."
+        echo "[tue-env](bootstrap) Ubuntu ${DISTRIB_RELEASE} is unsupported. Please use one of Ubuntu 20.04 or 22.04."
         exit 1
         ;;
 esac
@@ -132,84 +132,84 @@ esac
 env_url="https://github.com/tue-robotics/tue-env.git"
 { [[ -n "${targets_repo}" ]] && env_targets_url="${targets_repo}"; } || env_targets_url="https://github.com/tue-robotics/tue-env-targets.git"
 [[ -n "${create_virtualenv}" ]] || create_virtualenv="true"
-env_dir="$HOME/.tue"
-workspace="ros-$TUE_ROS_DISTRO"
-workspace_dir="$HOME/ros/$TUE_ROS_DISTRO"
+env_dir="${HOME}/.tue"
+workspace="ros-${TUE_ROS_DISTRO}"
+workspace_dir="${HOME}/ros/${TUE_ROS_DISTRO}"
 
 # Move old environments and installer
-if [ -d "$env_dir" ] && [ -z "$CI" ]
+if [ -d "${env_dir}" ] && [ -z "${CI}" ]
 then
-    FILES=$(find "$env_dir"/user/envs -maxdepth 1 -type f)
+    FILES=$(find "${env_dir}"/user/envs -maxdepth 1 -type f)
     date_now=$(date +%F_%R)
-    for env in $FILES
+    for env in ${FILES}
     do
-        mv -f "$(cat "$env")" "$(cat "$env")"."$date_now"
+        mv -f "$(cat "${env}")" "$(cat "${env}")"."${date_now}"
     done
-    mv -f "$env_dir" "$env_dir"."$date_now"
+    mv -f "${env_dir}" "${env_dir}"."${date_now}"
 fi
 
 # If in CI with Docker, then clone tue-env with BRANCH when not testing a PR
-if [ "$CI" == "true" ] && [ "$DOCKER" == "true" ]
+if [ "${CI}" == "true" ] && [ "${DOCKER}" == "true" ]
 then
     # Docker has a default value as false for PULL_REQUEST
-    if [ "$PULL_REQUEST" == "false" ]
+    if [ "${PULL_REQUEST}" == "false" ]
     then
-        if [ -n "$COMMIT" ]
+        if [ -n "${COMMIT}" ]
         then
-            if [ -n "$BRANCH" ]
+            if [ -n "${BRANCH}" ]
             then
-                echo -e "[tue-env](bootstrap) Cloning tue-env repository with branch: $BRANCH at commit: $COMMIT"
-                git clone -q --single-branch --branch "$BRANCH" "$env_url" "$env_dir"
+                echo -e "[tue-env](bootstrap) Cloning tue-env repository with branch: ${BRANCH} at commit: ${COMMIT}"
+                git clone -q --single-branch --branch "${BRANCH}" "${env_url}" "${env_dir}"
             else
-                echo -e "[tue-env](bootstrap) Cloning tue-env repository with default branch at commit: $COMMIT"
-                git clone -q --single-branch "$env_url" "$env_dir"
+                echo -e "[tue-env](bootstrap) Cloning tue-env repository with default branch at commit: ${COMMIT}"
+                git clone -q --single-branch "${env_url}" "${env_dir}"
             fi
-            git -C "$env_dir" reset --hard "$COMMIT"
+            git -C "${env_dir}" reset --hard "${COMMIT}"
         else
             echo -e "[tue-env](bootstrap) Error! CI branch or commit is unset"
             return 1
         fi
     else
         echo -e "[tue-env](bootstrap) Testing Pull Request"
-        [ -z "$REF_NAME" ] && { echo "Error! Environment variable REF_NAME is not set."; exit 1; }
+        [ -z "${REF_NAME}" ] && { echo "Error! Environment variable REF_NAME is not set."; exit 1; }
 
-        git clone -q --depth=10 "$env_url" "$env_dir"
-        git -C "$env_dir" fetch origin "$REF_NAME"/"$PULL_REQUEST"/merge:PULLREQUEST || { echo "Error! Could not fetch refs"; exit 1; }
-        git -C "$env_dir" checkout PULLREQUEST
+        git clone -q --depth=10 "${env_url}" "${env_dir}"
+        git -C "${env_dir}" fetch origin "${REF_NAME}"/"${PULL_REQUEST}"/merge:PULLREQUEST || { echo "Error! Could not fetch refs"; exit 1; }
+        git -C "${env_dir}" checkout PULLREQUEST
     fi
 else
     # Update installer
     echo -e "[tue-env](bootstrap) Cloning tue-env repository"
-    git clone "$env_url" "$env_dir"
+    git clone "${env_url}" "${env_dir}"
 fi
 
 # Source the installer commands
 # No need to follow to a file which is already checked by CI
 # shellcheck disable=SC1090
-source "$env_dir"/setup.bash
+source "${env_dir}"/setup.bash
 
 # Create ros environment directory
-mkdir -p "$workspace_dir"
+mkdir -p "${workspace_dir}"
 
 # Initialize ros environment directory incl. targets
 tue-env init "${workspace}" "${workspace_dir}" "--create-virtualenv=${create_virtualenv}" "--targets-url=${env_targets_url}"
 
 # Configure environment
-tue-env config "$workspace" set "TUE_ROS_DISTRO" "$TUE_ROS_DISTRO"
-tue-env config "$workspace" set "TUE_ROS_VERSION" "$TUE_ROS_VERSION"
+tue-env config "${workspace}" set "TUE_ROS_DISTRO" "${TUE_ROS_DISTRO}"
+tue-env config "${workspace}" set "TUE_ROS_VERSION" "${TUE_ROS_VERSION}"
 
 # Add loading of TU/e tools (tue-env, tue-get, etc) to bashrc
 # shellcheck disable=SC2088
-if ! grep -q "$env_dir/setup.bash" ~/.bashrc;
+if ! grep -q "${env_dir}/setup.bash" ~/.bashrc;
 then
     echo "
 # Load TU/e tools
-source $env_dir/setup.bash" >> ~/.bashrc
+source ${env_dir}/setup.bash" >> ~/.bashrc
 fi
 
 # Set this environment as default
-tue-env set-default "$workspace"
+tue-env set-default "${workspace}"
 
 # Activate the default environment
 # shellcheck disable=SC1090
-source "$env_dir"/setup.bash
+source "${env_dir}"/setup.bash