Skip to content

Commit 855755e

Browse files
(CI) update styling
1 parent 3ab21b2 commit 855755e

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

.ci/install.bash

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@ do
2424
SSH_KEY="${i#*=}" ;;
2525

2626
--sl=* | --skiplist=* )
27-
SKIPLIST="${SKIPLIST:+$SKIPLIST }${i#*=}" ;;
27+
SKIPLIST="${SKIPLIST:+${SKIPLIST} }${i#*=}" ;;
2828

2929
* )
3030
# unknown option
3131
if [[ -n "$i" ]]
3232
then
33-
echo -e "\e[35m\e[1mUnknown input argument '$i'. Check CI yaml file\e[0m"
33+
echo -e "\e[35m\e[1mUnknown input argument '${i}'. Check CI yaml file\e[0m"
3434
exit 1
3535
fi ;;
3636
esac
3737
shift
3838
done
3939

4040
echo -e "\e[35m\e[1mBRANCH = ${BRANCH}\e[0m"
41-
echo -e "\e[35m\e[1mSKIPLIST = ${SKIPLIST}\e[0m"
41+
echo -e "\e[35m\e[1mSKIPLIST = ${SKIPLIST}\e[0m"
4242

4343
# Set default value for IMAGE_NAME
44-
[ -z "$IMAGE_NAME" ] && IMAGE_NAME='tuerobotics/tue-env-ros-noetic'
44+
[ -z "${IMAGE_NAME}" ] && IMAGE_NAME='tuerobotics/tue-env-ros-noetic'
4545
echo -e "\e[35m\e[1mIMAGE_NAME = ${IMAGE_NAME}\e[0m"
4646

4747
# Determine docker tag if the same branch exists there
@@ -69,7 +69,7 @@ then
6969
DOCKER_MOUNT_KNOWN_HOSTS_ARGS="--mount type=bind,source=${HOME}/.ssh/known_hosts,target=/tmp/known_hosts_extra"
7070
fi
7171

72-
DOCKER_HOME=$(docker run --name tue-env --rm "$IMAGE_NAME:$BRANCH_TAG" bash -c 'echo "$HOME"' | tr -d '\r')
72+
DOCKER_HOME=$(docker run --name tue-env --rm "${IMAGE_NAME}:${BRANCH_TAG}" bash -c 'echo "${HOME}"' | tr -d '\r')
7373

7474
# Make sure the ~/.ccache folder exists
7575
mkdir -p "$HOME"/.ccache
@@ -110,18 +110,18 @@ echo -e "\e[35m\e[1mtue-get install ros-python_orocos_kdl" "${INSTALL_BUILD_TARG
110110
# shellcheck disable=SC2145
111111
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
112112

113-
if [ -n "$SKIPLIST" ]
113+
if [ -n "${SKIPLIST}" ]
114114
then
115-
echo -e '\e[35m\e[1mcatkin config --workspace $TUE_SYSTEM_DIR --skiplist '"${SKIPLIST}"'\e[0m'
116-
docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace $TUE_SYSTEM_DIR --skiplist '"${SKIPLIST}"
115+
echo -e '\e[35m\e[1mcatkin config --workspace ${TUE_SYSTEM_DIR} --skiplist '"${SKIPLIST}"'\e[0m'
116+
docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace ${TUE_SYSTEM_DIR} --skiplist '"${SKIPLIST}"
117117
fi
118118

119119
echo -e "\e[35m\e[1mtue-make --no-status -DCATKIN_ENABLE_TESTING=OFF python_orocos_kdl" "${INSTALL_BUILD_PKGS[*]}" "${BUILD_PKGS[*]}" "\e[0m"
120120
# shellcheck disable=SC2145
121121
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
122122

123-
if [ -n "$SKIPLIST" ]
123+
if [ -n "${SKIPLIST}" ]
124124
then
125-
echo -e '\e[35m\e[1mcatkin config --workspace $TUE_SYSTEM_DIR --no-skiplist\e[0m'
126-
docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace $TUE_SYSTEM_DIR --no-skiplist' # Clear skiplist
125+
echo -e '\e[35m\e[1mcatkin config --workspace ${TUE_SYSTEM_DIR} --no-skiplist\e[0m'
126+
docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace ${TUE_SYSTEM_DIR} --no-skiplist' # Clear skiplist
127127
fi

0 commit comments

Comments
 (0)