Skip to content

Commit 8818e57

Browse files
committed
Avoid unnecessary double quotes
1 parent 0cb5733 commit 8818e57

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

travis-ci

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
# shellcheck source=commands/.settings
44
. "${BASH_SOURCE%/*}/commands/.settings"
55

6-
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
6+
if [ "$TRAVIS_OS_NAME" = linux ]; then
77
TMP="/tmp/"
8-
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
8+
elif [ "$TRAVIS_OS_NAME" = osx ]; then
99
TMP="$TMPDIR"
1010
fi
1111

1212
LOCK="${TMP}install.lock"
1313
OUT="${TMP}install.out"
1414

15-
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
15+
if [ "$TRAVIS_OS_NAME" = linux ]; then
1616
locked() { flock "$LOCK" "$@"; }
17-
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
17+
elif [ "$TRAVIS_OS_NAME" = osx ]; then
1818
locked() {
1919
while ! shlock -f "$LOCK" -p $$ ; do sleep 0.25; done
2020
local EXIT=0
2121
"$@" || EXIT=$?
2222
rm -f "$LOCK"
2323
return $EXIT
2424
}
25-
elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
25+
elif [ "$TRAVIS_OS_NAME" = windows ]; then
2626
locked() { "$@"; }
2727
fi
2828

@@ -58,13 +58,13 @@ folded() {
5858
N_PARALLEL_UPDATE="${N_PARALLEL_UPDATE:-$NUMBER_OF_PROCESSORS}"
5959
folded ... concurrently GIT_UPDATE_PID git submodule update --init --depth 1 --jobs "$N_PARALLEL_UPDATE"
6060

61-
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
62-
folded ... concurrently LIBSTD_INSTALL_PID locked bash -c "sudo -E apt-add-repository -y ppa:ubuntu-toolchain-r/test && sudo -E apt-get -yq update && sudo -E apt-get -yq --no-install-suggests --no-install-recommends install libstdc++-8-dev"
61+
if [ "$TRAVIS_OS_NAME" = linux ]; then
62+
folded ... concurrently LIBSTD_INSTALL_PID locked bash -c 'sudo -E apt-add-repository -y ppa:ubuntu-toolchain-r/test && sudo -E apt-get -yq update && sudo -E apt-get -yq --no-install-suggests --no-install-recommends install libstdc++-8-dev'
6363
folded ... concurrently GCC_INSTALL_PID locked sudo -E apt-get -yq --no-install-suggests --no-install-recommends install g++-8
64-
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
64+
elif [ "$TRAVIS_OS_NAME" = osx ]; then
6565
[ "$CODECOV" != 1 ] || folded ... concurrently LCOV_INSTALL_PID locked brew install lcov
6666
[ "$FORMAT_CHECK" = 0 ] || folded ... concurrently FORMAT_INSTALL_PID locked brew install prettier clang-format
67-
elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
67+
elif [ "$TRAVIS_OS_NAME" = windows ]; then
6868
folded ... concurrently MAKE_INSTALL_PID locked choco install make
6969
fi
7070

@@ -79,18 +79,18 @@ folded ... finish GIT_UPDATE_PID
7979

8080
for CONFIG in Debug Release; do
8181
export CMAKE_BUILD_TYPE=$CONFIG
82-
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
82+
if [ "$TRAVIS_OS_NAME" = linux ]; then
8383
folded ... finish LIBSTD_INSTALL_PID
84-
CC="clang" CXX="clang++" folded "Clang $CONFIG" cppsm test
84+
CC=clang CXX=clang++ folded "Clang $CONFIG" cppsm test
8585
folded ... finish GCC_INSTALL_PID
86-
CC="gcc-8" CXX="g++-8" folded "GCC $CONFIG" cppsm test
87-
elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
88-
CC="" CXX="" folded "VC $CONFIG" cppsm test
86+
CC=gcc-8 CXX=g++-8 folded "GCC $CONFIG" cppsm test
87+
elif [ "$TRAVIS_OS_NAME" = windows ]; then
88+
CC='' CXX='' folded "VC $CONFIG" cppsm test
8989
folded ... finish MAKE_INSTALL_PID
9090
CC="gcc" CXX="g++" folded "GCC $CONFIG" cppsm test
91-
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
92-
CC="clang" CXX="clang++" folded "Clang $CONFIG" cppsm test
93-
CC="gcc-8" CXX="g++-8" folded "GCC $CONFIG" cppsm test
91+
elif [ "$TRAVIS_OS_NAME" = osx ]; then
92+
CC=clang CXX=clang++ folded "Clang $CONFIG" cppsm test
93+
CC=gcc-8 CXX=g++-8 folded "GCC $CONFIG" cppsm test
9494
else
9595
echo "Unsupported OS: $TRAVIS_OS_NAME"
9696
exit 1
@@ -114,12 +114,12 @@ format-check() {
114114
fi
115115
}
116116

117-
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
117+
if [ "$TRAVIS_OS_NAME" = osx ]; then
118118
[ "$CODECOV" != 1 ] || folded ... finish LCOV_INSTALL_PID
119-
[ "$CODECOV" != 1 ] || folded "Code coverage" code-coverage
119+
[ "$CODECOV" != 1 ] || folded 'Code coverage' code-coverage
120120

121121
[ "$FORMAT_CHECK" = 0 ] || folded ... finish FORMAT_INSTALL_PID
122-
[ "$FORMAT_CHECK" = 0 ] || folded "Format check" format-check
122+
[ "$FORMAT_CHECK" = 0 ] || folded 'Format check' format-check
123123
fi
124124

125125
install-output() { cat "$OUT"; }

0 commit comments

Comments
 (0)