diff options
| author | Simon Warta <[email protected]> | 2015-07-21 10:06:41 +0200 |
|---|---|---|
| committer | Simon Warta <[email protected]> | 2015-07-22 16:40:44 +0200 |
| commit | 0e2271d2391e2855193953bb0acdb47e56d280de (patch) | |
| tree | ce5a4a2038aff312f0d4492051e70189e91cc21f /src/scripts/ci | |
| parent | 46a7902a935cbd25118d2900a36aaa99355a662d (diff) | |
Use shellcheck where possible
Diffstat (limited to 'src/scripts/ci')
| -rwxr-xr-x | src/scripts/ci/after_success.sh | 2 | ||||
| -rwxr-xr-x | src/scripts/ci/build.sh | 16 | ||||
| -rwxr-xr-x | src/scripts/ci/install.sh | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/scripts/ci/after_success.sh b/src/scripts/ci/after_success.sh index 76e16e05b..5cd01b39a 100755 --- a/src/scripts/ci/after_success.sh +++ b/src/scripts/ci/after_success.sh @@ -1,6 +1,6 @@ #!/bin/sh - set -ev +which shellcheck > /dev/null && shellcheck "$0" # Run shellcheck on this if available if [ "$BUILD_MODE" = "coverage" ]; then GCOV="/usr/bin/gcov-4.8" diff --git a/src/scripts/ci/build.sh b/src/scripts/ci/build.sh index 9bb7ce7e6..9bf7b0e84 100755 --- a/src/scripts/ci/build.sh +++ b/src/scripts/ci/build.sh @@ -1,20 +1,20 @@ -#!/bin/sh - +#!/bin/bash set -ev +which shellcheck > /dev/null && shellcheck "$0" # Run shellcheck on this if available if [ "$BUILD_MODE" = "static" ]; then - CFG_FLAGS="--disable-shared --via-amalgamation" + CFG_FLAGS=(--disable-shared --via-amalgamation) elif [ "$BUILD_MODE" = "shared" ]; then - CFG_FLAGS="" + CFG_FLAGS=() elif [ "$BUILD_MODE" = "coverage" ]; then # lcov gets confused by symlinks - CFG_FLAGS="--build-mode=coverage --link-method=copy" + CFG_FLAGS=(--build-mode=coverage --link-method=copy) elif [ "$BUILD_MODE" = "sanitizer" ]; then - CFG_FLAGS="--build-mode=sanitizer" + CFG_FLAGS=(--build-mode=sanitizer) fi if [ "$MODULES" = "min" ]; then - CFG_FLAGS="$CFG_FLAGS --no-autoload --enable-modules=base" + CFG_FLAGS+=(--no-autoload --enable-modules=base) fi # Workaround for missing update-alternatives @@ -32,7 +32,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then fi $CXX --version -./configure.py $CFG_FLAGS --cc="$CC" --cc-bin="$CXX" \ +./configure.py "${CFG_FLAGS[@]}" --cc="$CC" --cc-bin="$CXX" \ --with-openssl --with-sqlite --with-zlib \ --prefix=/tmp/botan-installation make -j 2 diff --git a/src/scripts/ci/install.sh b/src/scripts/ci/install.sh index dd9b7e371..364d447bf 100755 --- a/src/scripts/ci/install.sh +++ b/src/scripts/ci/install.sh @@ -1,6 +1,6 @@ #!/bin/sh - set -ev +which shellcheck > /dev/null && shellcheck "$0" # Run shellcheck on this if available if [ "$BUILD_MODE" = "coverage" ]; then wget http://ftp.de.debian.org/debian/pool/main/l/lcov/lcov_1.11.orig.tar.gz |