Merge bitcoin#23462: test: Enable SC2046 and SC2086 shellcheck rules

fe0ff56 test: Enable SC2046 shellcheck rule (Hennadii Stepanov)
9a1ad7b test: Enable SC2086 shellcheck rule (Hennadii Stepanov)

Pull request description:

  Closes bitcoin#20879.
  Replaces bitcoin#22695.

  **Note for reviewers**. Some touched shell scripts are not being run in CI, therefore they require more thorough reviewing:
  - `contrib/devtools/gen-manpages.sh`
  - `contrib/macdeploy/detached-sig-apply.sh`
  - `contrib/windeploy/detached-sig-create.sh`
  - `src/qt/res/animation/makespinner.sh`

ACKs for top commit:
  laanwj:
    Code review re-ACK fe0ff56

Tree-SHA512: 73619b9a7bcb6cf0dfc4189a753ef550d40c82a3432bb9d8d8a994310d42594576038daac7e0c2fc004d716976bb1413b9a77848ecf088b25b69ed0773b77e8e

Author: laanwj

ci/dash/build_depends.sh

@@ -14,14 +14,14 @@ source ./ci/dash/matrix.sh
 unset CC; unset CXX
 unset DISPLAY
 
-mkdir -p $CACHE_DIR/depends
-mkdir -p $CACHE_DIR/sdk-sources
+mkdir -p "$CACHE_DIR/depends"
+mkdir -p "$CACHE_DIR/sdk-sources"
 
-ln -s $CACHE_DIR/depends ${DEPENDS_DIR}/built
-ln -s $CACHE_DIR/sdk-sources ${DEPENDS_DIR}/sdk-sources
+ln -s "$CACHE_DIR/depends" "${DEPENDS_DIR}/built"
+ln -s "$CACHE_DIR/sdk-sources" "${DEPENDS_DIR}/sdk-sources"
 
 if [[ "${HOST}" == "x86_64-apple-darwin" ]]; then
     ./contrib/containers/guix/scripts/setup-sdk
 fi
 
-make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
+make "$MAKEJOBS" -C depends HOST="$HOST" "$DEP_OPTS"

ci/dash/build_src.sh

@@ -14,7 +14,7 @@ source ./ci/dash/matrix.sh
 unset CC; unset CXX
 unset DISPLAY
 
-if [ "$PULL_REQUEST" != "false" ]; then test/lint/commit-script-check.sh $COMMIT_RANGE; fi
+if [ "$PULL_REQUEST" != "false" ]; then test/lint/commit-script-check.sh "$COMMIT_RANGE"; fi
 
 if [ "$CHECK_DOC" = 1 ]; then
     # TODO: Verify subtrees
@@ -28,7 +28,7 @@ if [ "$CHECK_DOC" = 1 ]; then
     test/lint/all-lint.py
 fi
 
-ccache --zero-stats --max-size=$CCACHE_SIZE
+ccache --zero-stats --max-size="$CCACHE_SIZE"
 
 if [ -n "$CONFIG_SHELL" ]; then
   export CONFIG_SHELL="$CONFIG_SHELL"
@@ -46,23 +46,23 @@ mkdir build-ci
 cd build-ci
 
 bash -c "../configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( cat config.log && false)
-make distdir VERSION=$BUILD_TARGET
+make distdir VERSION="$BUILD_TARGET"
 
-cd dashcore-$BUILD_TARGET
+cd "dashcore-$BUILD_TARGET"
 bash -c "./configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( cat config.log && false)
 
 if [ "${RUN_TIDY}" = "true" ]; then
   MAYBE_BEAR="bear --config src/.bear-tidy-config"
   MAYBE_TOKEN="--"
 fi
 
-bash -c "${MAYBE_BEAR} ${MAYBE_TOKEN} make ${MAKEJOBS} ${GOAL}" || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
+bash -c "${MAYBE_BEAR} ${MAYBE_TOKEN} make ${MAKEJOBS} ${GOAL}" || ( echo "Build failure. Verbose build follows." && make "$GOAL" V=1 ; false )
 
 ccache --version | head -n 1 && ccache --show-stats
 
 if [ -n "$USE_VALGRIND" ]; then
     echo "valgrind in USE!"
-    ${BASE_ROOT_DIR}/ci/test/wrap-valgrind.sh
+    "${BASE_ROOT_DIR}/ci/test/wrap-valgrind.sh"
 fi
 
 if [ "${RUN_TIDY}" = "true" ]; then

ci/dash/test_integrationtests.sh

@@ -22,10 +22,11 @@ export LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib
 
 if [ -n "$PREVIOUS_RELEASES_TO_DOWNLOAD" ]; then
   echo "Downloading previous releases: $PREVIOUS_RELEASES_TO_DOWNLOAD"
+  # shellcheck disable=SC2086
   ./test/get_previous_releases.py -b -t "$PREVIOUS_RELEASES_DIR" ${PREVIOUS_RELEASES_TO_DOWNLOAD}
 fi
 
-cd build-ci/dashcore-$BUILD_TARGET
+cd "build-ci/dashcore-$BUILD_TARGET"
 
 if [ "$SOCKETEVENTS" = "" ]; then
   # Let's switch socketevents mode to some random mode
@@ -42,29 +43,30 @@ echo "Using socketevents mode: $SOCKETEVENTS"
 EXTRA_ARGS="--dashd-arg=-socketevents=$SOCKETEVENTS"
 
 set +e
-LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib ./test/functional/test_runner.py --ci --attempts=3 --ansi --combinedlogslen=4000 --timeout-factor=${TEST_RUNNER_TIMEOUT_FACTOR} ${TEST_RUNNER_EXTRA} --failfast --nocleanup --tmpdir=$(pwd)/testdatadirs $PASS_ARGS $EXTRA_ARGS
+# shellcheck disable=SC2086
+LD_LIBRARY_PATH="$DEPENDS_DIR/$HOST/lib" ./test/functional/test_runner.py --ci --attempts=3 --ansi --combinedlogslen=4000 --timeout-factor="${TEST_RUNNER_TIMEOUT_FACTOR}" ${TEST_RUNNER_EXTRA} --failfast --nocleanup --tmpdir="$(pwd)/testdatadirs" $PASS_ARGS $EXTRA_ARGS
 RESULT=$?
 set -e
 
 echo "Collecting logs..."
-BASEDIR=$(ls testdatadirs)
+BASEDIR="$(ls testdatadirs)"
 if [ "$BASEDIR" != "" ]; then
   mkdir testlogs
-  TESTDATADIRS=$(ls testdatadirs/$BASEDIR)
+  TESTDATADIRS=$(ls "testdatadirs/$BASEDIR")
   for d in $TESTDATADIRS; do
     [[ "$d" ]] || break # found nothing
     [[ "$d" != "cache" ]] || continue # skip cache dir
-    mkdir testlogs/$d
-    PYTHONIOENCODING=UTF-8 ./test/functional/combine_logs.py -c ./testdatadirs/$BASEDIR/$d > ./testlogs/$d/combined.log
+    mkdir "testlogs/$d"
+    PYTHONIOENCODING=UTF-8 ./test/functional/combine_logs.py -c "./testdatadirs/$BASEDIR/$d" > "./testlogs/$d/combined.log"
     # Disabled creation of combined.html: 40% smaller CI job artifacts
     # PYTHONIOENCODING=UTF-8 ./test/functional/combine_logs.py --html ./testdatadirs/$BASEDIR/$d > ./testlogs/$d/combined.html
-    cd testdatadirs/$BASEDIR/$d
+    cd "testdatadirs/$BASEDIR/$d"
     LOGFILES="$(find . -name 'debug.log' -or -name "test_framework.log")"
     cd ../../..
     for f in $LOGFILES; do
-      d2="testlogs/$d/$(dirname $f)"
-      mkdir -p $d2
-      cp testdatadirs/$BASEDIR/$d/$f $d2/
+      d2="testlogs/$d/$(dirname "$f")"
+      mkdir -p "$d2"
+      cp "testdatadirs/$BASEDIR/$d/$f" "$d2/"
     done
   done
 fi

ci/dash/test_unittests.sh

@@ -16,13 +16,13 @@ if [ "$RUN_UNIT_TESTS" != "true" ] && [ "$RUN_UNIT_TESTS_SEQUENTIAL" != "true" ]
   exit 0
 fi
 
-export BOOST_TEST_RANDOM=${BOOST_TEST_RANDOM:-1}
-export LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib
+export BOOST_TEST_RANDOM="${BOOST_TEST_RANDOM:-1}"
+export LD_LIBRARY_PATH="$DEPENDS_DIR/$HOST/lib"
 
 export WINEDEBUG=fixme-all
 export BOOST_TEST_LOG_LEVEL=test_suite
 
-cd build-ci/dashcore-$BUILD_TARGET
+cd "build-ci/dashcore-$BUILD_TARGET"
 
 export WINEPREFIX="/tmp/wine"
 mkdir -p "$WINEPREFIX"
@@ -34,6 +34,6 @@ else
   if [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
     ./src/test/test_dash --catch_system_errors=no -l test_suite
   else
-      make $MAKEJOBS check VERBOSE=1
+      make "$MAKEJOBS" check VERBOSE=1
   fi
 fi

ci/test/04_install.sh

@@ -35,6 +35,7 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
   echo "Creating $DOCKER_NAME_TAG container to run in"
   ${CI_RETRY_EXE} docker pull "$DOCKER_NAME_TAG"
 
+  # shellcheck disable=SC2086
   DOCKER_ID=$(docker run $DOCKER_ADMIN -idt \
                   --mount type=bind,src=$BASE_ROOT_DIR,dst=/ro_base,readonly \
                   --mount type=bind,src=$CCACHE_DIR,dst=$CCACHE_DIR \

contrib/auto_gdb/dash_dbg.sh

@@ -5,5 +5,5 @@
 # use testnet settings,  if you need mainnet,  use ~/.dashcore/dashd.pid file instead
 export LC_ALL=C
 
-dash_pid=$(<~/.dashcore/testnet3/dashd.pid)
-sudo gdb -batch -ex "source debug.gdb" dashd ${dash_pid}
+dash_pid="$(<~/.dashcore/testnet3/dashd.pid)"
+sudo gdb -batch -ex "source debug.gdb" dashd "${dash_pid}"

contrib/containers/deploy/docker-entrypoint.sh

@@ -10,11 +10,11 @@ set -e
 if [[ "$1" == "dashd" ]]; then
   # Because dashd only accept torcontrol= host as an ip only, we resolve it here and add to config
   if [[ "$TOR_CONTROL_HOST" ]] && [[ "$TOR_CONTROL_PORT" ]] && [[ "$TOR_PROXY_PORT" ]]; then
-    TOR_IP=$(getent hosts $TOR_CONTROL_HOST | cut -d ' ' -f 1)
+    TOR_IP=$(getent hosts "$TOR_CONTROL_HOST" | cut -d ' ' -f 1)
     echo "proxy=$TOR_IP:$TOR_PROXY_PORT" >> "$HOME/.dashcore/dash.conf"
-    echo "Added "proxy=$TOR_IP:$TOR_PROXY_PORT" to $HOME/.dashcore/dash.conf"
+    echo "Added \"proxy=$TOR_IP:$TOR_PROXY_PORT\" to $HOME/.dashcore/dash.conf"
     echo "torcontrol=$TOR_IP:$TOR_CONTROL_PORT" >> "$HOME/.dashcore/dash.conf"
-    echo "Added "torcontrol=$TOR_IP:$TOR_CONTROL_PORT" to $HOME/.dashcore/dash.conf"
+    echo "Added \"torcontrol=$TOR_IP:$TOR_CONTROL_PORT\" to $HOME/.dashcore/dash.conf"
     echo -e "\n"
   else
     echo "Tor control credentials not provided"

test/lint/lint-cppcheck-dash.sh

@@ -62,6 +62,7 @@ IGNORED_WARNINGS=(
 )
 
 # We should attempt to update this with all dash specific code
+# shellcheck disable=SC2046
 FILES=$(git ls-files -- $(cat test/util/data/non-backported.txt))
 
 
@@ -86,12 +87,12 @@ if [[ -n "$CACHE_DIR" ]]; then
 else
     CPPCHECK_DIR=$SCRIPT_DIR/.cppcheck/
 fi
-if [ ! -d $CPPCHECK_DIR ]
+if [ ! -d "$CPPCHECK_DIR" ]
 then
-    mkdir -p $CPPCHECK_DIR
+    mkdir -p "$CPPCHECK_DIR"
 fi
 WARNINGS=$(echo "${FILES}" | \
-    xargs cppcheck --enable=all --inline-suppr --suppress=missingIncludeSystem --cppcheck-build-dir=$CPPCHECK_DIR -j "$(getconf _NPROCESSORS_ONLN)" --language=c++ --std=c++20 --template=gcc -D__cplusplus -DENABLE_WALLET -DCLIENT_VERSION_BUILD -DCLIENT_VERSION_IS_RELEASE -DCLIENT_VERSION_MAJOR -DCLIENT_VERSION_MINOR -DCOPYRIGHT_YEAR -DDEBUG -DUSE_EPOLL -DCHAR_BIT=8 -I src/ -q 2>&1 | sort -u | \
+    xargs cppcheck --enable=all --inline-suppr --suppress=missingIncludeSystem --cppcheck-build-dir="$CPPCHECK_DIR" -j "$(getconf _NPROCESSORS_ONLN)" --language=c++ --std=c++20 --template=gcc -D__cplusplus -DENABLE_WALLET -DCLIENT_VERSION_BUILD -DCLIENT_VERSION_IS_RELEASE -DCLIENT_VERSION_MAJOR -DCLIENT_VERSION_MINOR -DCOPYRIGHT_YEAR -DDEBUG -DUSE_EPOLL -DCHAR_BIT=8 -I src/ -q 2>&1 | sort -u | \
     grep -E "${ENABLED_CHECKS_REGEXP}" | \
     grep -vE "${IGNORED_WARNINGS_REGEXP}" | \
     grep -E "${FILES_REGEXP}")

test/lint/lint-shell.py

@@ -14,8 +14,6 @@
 
 # Disabled warnings:
 DISABLED = [
-    'SC2046', # Quote this to prevent word splitting.
-    'SC2086', # Double quote to prevent globbing and word splitting.
     'SC2162', # read without -r will mangle backslashes.
 ]