sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some shellcheck warnings

Browse Source
This commit is contained in:
Nyall Dawson 2018-06-01 08:21:48 +10:00
parent efa7f99b6f
commit 408a9fbf0b
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/travis/code_layout/script.sh
View File

@ -19,6 +19,6 @@ pushd build
export CTEST_BUILD_DIR=${TRAVIS_BUILD_DIR} export CTEST_BUILD_DIR=${TRAVIS_BUILD_DIR}
export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k" export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
python3 ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V --output-on-failure -S ${TRAVIS_BUILD_DIR}/.ci/travis/travis.ctest python3 "${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py" xvfb-run ctest -V --output-on-failure -S "${TRAVIS_BUILD_DIR}/.ci/travis/travis.ctest"
popd popd

6
.ci/travis/macos/before_install.sh
View File

@ -13,7 +13,7 @@
# # # #
########################################################################### ###########################################################################
echo `date +%s` > /tmp/travis_timestamp date +%s > /tmp/travis_timestamp
brew tap osgeo/osgeo4mac brew tap osgeo/osgeo4mac
brew update brew update
@ -56,5 +56,5 @@ brew install \
libzip libzip
mkdir -p ${HOME}/Library/Python/3.6/lib/python/site-packages mkdir -p "${HOME}/Library/Python/3.6/lib/python/site-packages"
echo 'import site; site.addsitedir("/usr/local/opt/gdal2-python/lib/python3.6/site-packages")' >> ${HOME}/Library/Python/3.6/lib/python/site-packages/gdal2.pth echo 'import site; site.addsitedir("/usr/local/opt/gdal2-python/lib/python3.6/site-packages")' >> "${HOME}/Library/Python/3.6/lib/python/site-packages/gdal2.pth"

2
.ci/travis/macos/install.sh
View File

@ -51,7 +51,7 @@ done
cmake \ cmake \
-G 'Ninja' \ -G 'Ninja' \
-DCMAKE_FIND_FRAMEWORK:STRING=LAST \ -DCMAKE_FIND_FRAMEWORK:STRING=LAST \
-DCMAKE_PREFIX_PATH:STRING=${full_prefixes} \ -DCMAKE_PREFIX_PATH:STRING="${full_prefixes}" \
-DWITH_SERVER=OFF \ -DWITH_SERVER=OFF \
-DWITH_DESKTOP=OFF \ -DWITH_DESKTOP=OFF \
-DWITH_STAGED_PLUGINS=ON \ -DWITH_STAGED_PLUGINS=ON \

6
.ci/travis/macos/script.sh
View File

@ -14,7 +14,7 @@
########################################################################### ###########################################################################
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
echo $PATH echo "$PATH"
export PATH=/usr/bin:${PATH} export PATH=/usr/bin:${PATH}
@ -27,12 +27,12 @@ ccache -z
# #
# Travis will kill the job after approx 48 minutes, we subtract 8 minutes for # Travis will kill the job after approx 48 minutes, we subtract 8 minutes for
# uploading and initialization (40) and subtract the bootstrapping time from that. # uploading and initialization (40) and subtract the bootstrapping time from that.
TIMEOUT=$(expr 40 \* 60 - `date +%s` + `cat /tmp/travis_timestamp`) TIMEOUT=$(expr 40 \* 60 - "$(date +%s)" + "$(cat /tmp/travis_timestamp)")
export CTEST_BUILD_COMMAND=/usr/local/bin/ninja export CTEST_BUILD_COMMAND=/usr/local/bin/ninja
export CTEST_BUILD_DIR=${TRAVIS_BUILD_DIR} export CTEST_BUILD_DIR=${TRAVIS_BUILD_DIR}
gtimeout ${TIMEOUT}s ctest -V -E "$(cat ${DIR}/blacklist.txt | gsed -r '/^(#.*?)?$/d' | gpaste -sd '|' -)" -S ${DIR}/../travis.ctest --output-on-failure gtimeout "${TIMEOUT}s" ctest -V -E "$(cat ${DIR}/blacklist.txt | gsed -r '/^(#.*?)?$/d' | gpaste -sd '|' -)" -S "${DIR}/../travis.ctest" --output-on-failure
rv=$? rv=$?