Skip to content

Commit 2bd6926

Browse files
Fix shellcheck (#632)
* Remove pip completion of pip2 * Apply Shellcheck 0.8.0 * (tue-env) use more local vars * Bump version to 1.3.9 * (tue-data) use more local * (tue-env-config) use more local * (tue-env-config) declare local vars on sep line * (tue-env-config) move main code to func to use local vars * (tue-data) declare local vars on sep line * (tue-env) declare local vars on sep line * (tue-functions) declare local vars on sep line * (tue-get) declare local vars on sep line * (tue-functions) use 'local -a' for arrays * Rename array to prevent shellcheck bug koalaman/shellcheck#1309
1 parent 6d6fd6b commit 2bd6926

File tree

10 files changed

+362
-264
lines changed

10 files changed

+362
-264
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.8
1+
1.3.9

ci/install-package.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,15 +218,15 @@ then
218218
# After a tue-get run, we checkout forced, just to be sure.
219219

220220
# Fetch the merged branch
221-
echo -e "\e[35m\e[1mgit -C ~${TUE_SYSTEM_DIR#$DOCKER_HOME}/src/$PACKAGE fetch origin $REF_NAME/$PULL_REQUEST/merge:PULLREQUEST\e[0m"
221+
echo -e "\e[35m\e[1mgit -C ~${TUE_SYSTEM_DIR#"${DOCKER_HOME}"}/src/$PACKAGE fetch origin $REF_NAME/$PULL_REQUEST/merge:PULLREQUEST\e[0m"
222222
docker exec -t tue-env bash -c 'source ~/.bashrc; git -C "$TUE_SYSTEM_DIR"/src/"$PACKAGE" fetch origin "$REF_NAME"/"$PULL_REQUEST"/merge:PULLREQUEST'
223223

224224
# Install the package completely
225225
echo -e "\e[35m\e[1mtue-get install ros-$PACKAGE --test-depend --branch=PULLREQUEST\e[0m"
226226
docker exec tue-env bash -c 'source ~/.bashrc; tue-get install ros-"$PACKAGE" --test-depend --branch=PULLREQUEST'
227227

228228
# Checkout -f to be really sure
229-
echo -e "\e[35m\e[1mgit -C ~${TUE_SYSTEM_DIR#$DOCKER_HOME}/src/$PACKAGE checkout -f PULLREQUEST --\e[0m"
229+
echo -e "\e[35m\e[1mgit -C ~${TUE_SYSTEM_DIR#"${DOCKER_HOME}"}/src/$PACKAGE checkout -f PULLREQUEST --\e[0m"
230230
docker exec -t tue-env bash -c 'source ~/.bashrc; git -C "$TUE_SYSTEM_DIR"/src/"$PACKAGE" checkout -f PULLREQUEST --'
231231
else
232232
DEFAULT_BRANCH=$(docker exec -t tue-env bash -c 'source ~/.bashrc; _tue-git-get-default-branch "$TUE_SYSTEM_DIR"/src/"$PACKAGE"' | tr -d '\r')
@@ -243,6 +243,6 @@ else
243243

244244
# Set the package to the right commit
245245
echo -e "\e[35m\e[1mReset package to this commit\e[0m"
246-
echo -e "\e[35m\e[1mgit -C ~${TUE_SYSTEM_DIR#$DOCKER_HOME}/src/$PACKAGE reset --hard $COMMIT\e[0m"
246+
echo -e "\e[35m\e[1mgit -C ~${TUE_SYSTEM_DIR#"${DOCKER_HOME}"}/src/$PACKAGE reset --hard $COMMIT\e[0m"
247247
docker exec -t tue-env bash -c 'source ~/.bashrc; git -C "$TUE_SYSTEM_DIR"/src/"$PACKAGE" reset --hard "$COMMIT"'
248248
fi

0 commit comments

Comments
 (0)