sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-08 00:05:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Double quote to prevent globbing and word splitting.

Browse Source
This commit is contained in:
Matthias Kuhn 2018-06-19 16:22:38 +02:00
parent 6993380838
commit 353eb65117
No known key found for this signature in database
GPG Key ID: A0E766808764D73F
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/travis/linux/before_script.sh
View File

@ -47,7 +47,7 @@ echo "${bold}Docker build deps${endbold}"
docker --version docker --version
if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ false ]]; then if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ false ]]; then
docker-compose --version docker-compose --version
docker-compose -f $DOCKER_COMPOSE config docker-compose -f "${DOCKER_COMPOSE}" config
fi fi
if [[ $DOCKER_DEPS_IMAGE_REBUILD =~ true ]]; then if [[ $DOCKER_DEPS_IMAGE_REBUILD =~ true ]]; then

4
.ci/travis/linux/script.sh
View File

@ -24,7 +24,7 @@ mkdir -p $CCACHE_DIR
if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ true ]]; then if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ true ]]; then
DIR=$(git rev-parse --show-toplevel)/.docker DIR=$(git rev-parse --show-toplevel)/.docker
pushd ${DIR} pushd "${DIR}"
echo "${bold}Building QGIS Docker image '${DOCKER_TAG}'...${endbold}" echo "${bold}Building QGIS Docker image '${DOCKER_TAG}'...${endbold}"
docker build --build-arg CACHE_DIR=/root/.ccache \ docker build --build-arg CACHE_DIR=/root/.ccache \
--build-arg DOCKER_TAG=${DOCKER_TAG} \ --build-arg DOCKER_TAG=${DOCKER_TAG} \
@ -36,5 +36,5 @@ if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ true ]]; then
docker push "qgis/qgis:${DOCKER_TAG}" docker push "qgis/qgis:${DOCKER_TAG}"
popd popd
else else
docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps docker-compose -f "${DOCKER_COMPOSE}" run --rm qgis-deps
fi fi

8
scripts/addcopyright.sh
View File

@ -30,11 +30,11 @@ else
fi fi
for i in $FILES; do for i in $FILES; do
echo $i >&2 echo "${i}" >&2
author= author=
authordate= authordate=
eval $(git log --reverse --pretty="export author='%an' authordate=\"\$(date --date='%ai' +'%%B %Y')\"" $i | head -1) eval $(git log --reverse --pretty="export author='%an' authordate=\"\$(date --date='%ai' +'%%B %Y')\"" $i | head -1)
basename=$(basename $i) basename=$(basename "${i}")
authoryear=${authordate#* } authoryear=${authordate#* }
case $i in case $i in
@ -45,13 +45,13 @@ for i in $FILES; do
src/app/gps/qwtpolar-*|src/app/qtmain_android.cpp|src/core/gps/qextserialport/*|lib/astyle/*) src/app/gps/qwtpolar-*|src/app/qtmain_android.cpp|src/core/gps/qextserialport/*|lib/astyle/*)
# Skip third party files # Skip third party files
echo $f skipped echo "${i} skipped"
continue continue
;; ;;
esac esac
case $author in case "${author}" in
morb_au) morb_au)
authorname="Brendan Morley" authorname="Brendan Morley"
authoremail="morb at ozemail dot com dot au" authoremail="morb at ozemail dot com dot au"