From: Denis Ovsienko Date: Fri, 23 Jul 2021 13:05:18 +0000 (+0100) Subject: CI: Add missing SC2006 squelch directives. [skip ci] X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/c8e8e57d057ac6edd098ffbf11cd661099fc43c2 CI: Add missing SC2006 squelch directives. [skip ci] --- diff --git a/build.sh b/build.sh index 7f3931ba..b5f20589 100755 --- a/build.sh +++ b/build.sh @@ -13,6 +13,7 @@ . ./build_common.sh # Install directory prefix if [ -z "$PREFIX" ]; then + # shellcheck disable=SC2006 PREFIX=`mktempdir tcpdump_build` echo "PREFIX set to '$PREFIX'" fi @@ -51,11 +52,13 @@ run_after_echo make -s clean # are not warning-free for one or another reason. If you manage to fix one of # these cases, please remember to raise the bar here so if the warnings appear # again, it will trigger an error. +# shellcheck disable=SC2006 case `uname -s` in AIX) CFLAGS= ;; SunOS) + # shellcheck disable=SC2006 case `uname -r` in 5.10|5.11) CFLAGS=-Werror diff --git a/build_common.sh b/build_common.sh index 0209806e..50fcc388 100644 --- a/build_common.sh +++ b/build_common.sh @@ -105,6 +105,7 @@ run_after_echo() { } print_so_deps() { + # shellcheck disable=SC2006 case `uname -s` in Darwin) run_after_echo otool -L "${1:?}" diff --git a/build_matrix.sh b/build_matrix.sh index 2ee596b9..42bbaa99 100755 --- a/build_matrix.sh +++ b/build_matrix.sh @@ -18,6 +18,7 @@ print_sysinfo # Install directory prefix if [ -z "$PREFIX" ]; then + # shellcheck disable=SC2006 PREFIX=`mktempdir tcpdump_build_matrix` echo "PREFIX set to '$PREFIX'" export PREFIX @@ -28,6 +29,7 @@ build_tcpdump() { for CC in $MATRIX_CC; do export CC # Exclude gcc on macOS (it is just an alias for clang). + # shellcheck disable=SC2006 if [ "$CC" = gcc ] && [ "`uname -s`" = Darwin ]; then echo '(skipped)' continue @@ -38,6 +40,7 @@ build_tcpdump() { export CRYPTO for SMB in $MATRIX_SMB; do export SMB + # shellcheck disable=SC2006 COUNT=`increment $COUNT` echo_magenta "===== SETUP $COUNT: BUILD_LIBPCAP=$BUILD_LIBPCAP REMOTE=${REMOTE:-?} CC=$CC CMAKE=$CMAKE CRYPTO=$CRYPTO SMB=$SMB =====" # Run one build with setup environment variables: