Skip to content

Commit 353eb65

Browse files
committed
Double quote to prevent globbing and word splitting.
1 parent 6993380 commit 353eb65

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.ci/travis/linux/before_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ echo "${bold}Docker build deps${endbold}"
4747
docker --version
4848
if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ false ]]; then
4949
docker-compose --version
50-
docker-compose -f $DOCKER_COMPOSE config
50+
docker-compose -f "${DOCKER_COMPOSE}" config
5151
fi
5252

5353
if [[ $DOCKER_DEPS_IMAGE_REBUILD =~ true ]]; then

.ci/travis/linux/script.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ mkdir -p $CCACHE_DIR
2424

2525
if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ true ]]; then
2626
DIR=$(git rev-parse --show-toplevel)/.docker
27-
pushd ${DIR}
27+
pushd "${DIR}"
2828
echo "${bold}Building QGIS Docker image '${DOCKER_TAG}'...${endbold}"
2929
docker build --build-arg CACHE_DIR=/root/.ccache \
3030
--build-arg DOCKER_TAG=${DOCKER_TAG} \
@@ -36,5 +36,5 @@ if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ true ]]; then
3636
docker push "qgis/qgis:${DOCKER_TAG}"
3737
popd
3838
else
39-
docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps
39+
docker-compose -f "${DOCKER_COMPOSE}" run --rm qgis-deps
4040
fi

scripts/addcopyright.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ else
3030
fi
3131

3232
for i in $FILES; do
33-
echo $i >&2
33+
echo "${i}" >&2
3434
author=
3535
authordate=
3636
eval $(git log --reverse --pretty="export author='%an' authordate=\"\$(date --date='%ai' +'%%B %Y')\"" $i | head -1)
37-
basename=$(basename $i)
37+
basename=$(basename "${i}")
3838
authoryear=${authordate#* }
3939

4040
case $i in
@@ -45,13 +45,13 @@ for i in $FILES; do
4545

4646
src/app/gps/qwtpolar-*|src/app/qtmain_android.cpp|src/core/gps/qextserialport/*|lib/astyle/*)
4747
# Skip third party files
48-
echo $f skipped
48+
echo "${i} skipped"
4949
continue
5050
;;
5151

5252
esac
5353

54-
case $author in
54+
case "${author}" in
5555
morb_au)
5656
authorname="Brendan Morley"
5757
authoremail="morb at ozemail dot com dot au"

0 commit comments

Comments
 (0)