(CI) update styling (#31)

Author: MatthijsBurgh

.ci/get_install_build_packages.py

@@ -18,7 +18,7 @@
 
 for pkg_path in packages:
     pkg = os.path.split(pkg_path)[-1]
-    
+
     # Messages need to build and require there depencies
     for msg_type in ["action", "msg", "srv"]:
         if os.path.isdir(os.path.join(pkg_path, msg_type)):
@@ -37,9 +37,6 @@
                 break
         else:
             build_pkgs.add(pkg)
-
 print(
-    "INSTALL_BUILD_PKGS=({}); BUILD_PKGS=({})".format(
-        " ".join(install_build_pkgs.difference(skip_pkgs)), " ".join(build_pkgs.difference(skip_pkgs))
-    )
+    f"INSTALL_BUILD_PKGS=({' '.join(install_build_pkgs.difference(skip_pkgs))}); BUILD_PKGS=({' '.join(build_pkgs.difference(skip_pkgs))})"
 )

.ci/install.bash

@@ -24,24 +24,24 @@ do
             SSH_KEY="${i#*=}" ;;
 
         --sl=* | --skiplist=* )
-            SKIPLIST="${SKIPLIST:+$SKIPLIST }${i#*=}" ;;
+            SKIPLIST="${SKIPLIST:+${SKIPLIST} }${i#*=}" ;;
 
         * )
             # unknown option
             if [[ -n "$i" ]]
             then
-                echo -e "\e[35m\e[1mUnknown input argument '$i'. Check CI yaml file\e[0m"
+                echo -e "\e[35m\e[1mUnknown input argument '${i}'. Check CI yaml file\e[0m"
                 exit 1
             fi ;;
     esac
     shift
 done
 
 echo -e "\e[35m\e[1mBRANCH       = ${BRANCH}\e[0m"
-echo -e "\e[35m\e[1mSKIPLIST    = ${SKIPLIST}\e[0m"
+echo -e "\e[35m\e[1mSKIPLIST     = ${SKIPLIST}\e[0m"
 
 # Set default value for IMAGE_NAME
-[ -z "$IMAGE_NAME" ] && IMAGE_NAME='tuerobotics/tue-env-ros-noetic'
+[ -z "${IMAGE_NAME}" ] && IMAGE_NAME='tuerobotics/tue-env-ros-noetic'
 echo -e "\e[35m\e[1mIMAGE_NAME   = ${IMAGE_NAME}\e[0m"
 
 # Determine docker tag if the same branch exists there
@@ -69,7 +69,7 @@ then
     DOCKER_MOUNT_KNOWN_HOSTS_ARGS="--mount type=bind,source=${HOME}/.ssh/known_hosts,target=/tmp/known_hosts_extra"
 fi
 
-DOCKER_HOME=$(docker run --name tue-env --rm "$IMAGE_NAME:$BRANCH_TAG" bash -c 'echo "$HOME"' | tr -d '\r')
+DOCKER_HOME=$(docker run --name tue-env --rm "${IMAGE_NAME}:${BRANCH_TAG}" bash -c 'echo "${HOME}"' | tr -d '\r')
 
 # Make sure the ~/.ccache folder exists
 mkdir -p "$HOME"/.ccache
@@ -110,18 +110,18 @@ echo -e "\e[35m\e[1mtue-get install ros-python_orocos_kdl" "${INSTALL_BUILD_TARG
 # shellcheck disable=SC2145
 docker exec tue-env bash -c "source ~/.bashrc; tue-get install ros-python_orocos_kdl ${INSTALL_BUILD_TARGETS[*]}" # Needs to be installed fully as it needs to be build to generate docs
 
-if [ -n "$SKIPLIST" ]
+if [ -n "${SKIPLIST}" ]
 then
-    echo -e '\e[35m\e[1mcatkin config --workspace $TUE_SYSTEM_DIR --skiplist '"${SKIPLIST}"'\e[0m'
-    docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace $TUE_SYSTEM_DIR --skiplist '"${SKIPLIST}"
+    echo -e '\e[35m\e[1mcatkin config --workspace ${TUE_SYSTEM_DIR} --skiplist '"${SKIPLIST}"'\e[0m'
+    docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace ${TUE_SYSTEM_DIR} --skiplist '"${SKIPLIST}"
 fi
 
 echo -e "\e[35m\e[1mtue-make --no-status -DCATKIN_ENABLE_TESTING=OFF python_orocos_kdl" "${INSTALL_BUILD_PKGS[*]}" "${BUILD_PKGS[*]}" "\e[0m"
 # shellcheck disable=SC2145
 docker exec -t tue-env bash -c "source ~/.bashrc; tue-make --no-status -DCATKIN_ENABLE_TESTING=OFF python_orocos_kdl ${INSTALL_BUILD_PKGS[*]} ${BUILD_PKGS[*]}" # Needs to be build to generate docs
 
-if [ -n "$SKIPLIST" ]
+if [ -n "${SKIPLIST}" ]
 then
-    echo -e '\e[35m\e[1mcatkin config --workspace $TUE_SYSTEM_DIR --no-skiplist\e[0m'
-    docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace $TUE_SYSTEM_DIR --no-skiplist' # Clear skiplist
+    echo -e '\e[35m\e[1mcatkin config --workspace ${TUE_SYSTEM_DIR} --no-skiplist\e[0m'
+    docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace ${TUE_SYSTEM_DIR} --no-skiplist' # Clear skiplist
 fi

.ci/pre_deploy.bash

@@ -7,12 +7,12 @@ set -o errexit
 # Standard argument parsing, example: install-package --branch=master --package=ros_robot
 for i in "$@"
 do
-    case $i in
+    case ${i} in
         * )
             # unknown option
-            if [[ -n "$i" ]]
+            if [[ -n "${i}" ]]
             then
-                echo -e "\e[35m\e[1mUnknown input argument '$i'. Check CI yaml file\e[0m"
+                echo -e "\e[35m\e[1mUnknown input argument '${i}'. Check CI yaml file\e[0m"
                 exit 1
             fi ;;
     esac
@@ -21,5 +21,5 @@ done
 
 TUE_SYSTEM_DIR=$(docker exec -t tue-env bash -c 'source ~/.bashrc; echo "${TUE_SYSTEM_DIR}"' | tr -d '\r')
 
-echo -e "\e[35m\e[1m docker cp tue-env:${TUE_SYSTEM_DIR}/docs .\e[0m"
+echo -e "\e[35m\e[1mdocker cp tue-env:${TUE_SYSTEM_DIR}/docs .\e[0m"
 docker cp tue-env:"${TUE_SYSTEM_DIR}"/docs .

.ci/script.bash

@@ -7,17 +7,17 @@ set -o errexit
 # Standard argument parsing, example: install-package --branch=master --package=ros_robot
 for i in "$@"
 do
-    case $i in
+    case ${i} in
         * )
             # unknown option
-            if [[ -n "$i" ]]
+            if [[ -n "${i}" ]]
             then
-                echo -e "\e[35m\e[1mUnknown input argument '$i'. Check CI yaml file\e[0m"
+                echo -e "\e[35m\e[1mUnknown input argument '${i}'. Check CI yaml file\e[0m"
                 exit 1
             fi ;;
     esac
     shift
 done
 
-echo -e "\e[35m\e[1m tue-make-documentation --no-status\e[0m"
+echo -e "\e[35m\e[1mtue-make-documentation --no-status\e[0m"
 docker exec -t tue-env bash -c 'source ~/.bashrc; tue-make-documentation --no-status'