diff --git a/contrib/devtools/bitcoind-exit-on-log.sh b/contrib/devtools/bitcoind-exit-on-log.sh
index 1c651c8bb..361247b6b 100755
--- a/contrib/devtools/bitcoind-exit-on-log.sh
+++ b/contrib/devtools/bitcoind-exit-on-log.sh
@@ -1,159 +1,160 @@
 #!/usr/bin/env bash
 
 export LC_ALL=C
 
 set -euxo pipefail
 
 # Do not leave any dangling subprocesses when this script exits
 trap "kill 0" SIGINT
 
 TOPLEVEL=$(git rev-parse --show-toplevel)
 DEFAULT_BITCOIND="${TOPLEVEL}/build/src/bitcoind"
 DEFAULT_LOG_FILE=~/".bitcoin/debug.log"
 
 help_message() {
   set +x
   echo "Run bitcoind until a given log message is encountered, then kill bitcoind."
   echo ""
   echo "Example usages:"
   echo "$0 --grep 'progress=1.000000' --params \"-datadir=~/.bitcoin\" --callback mycallback"
   echo ""
   echo "Options:"
   echo "-h, --help            Display this help message."
   echo ""
   echo "-g, --grep            (required) The grep pattern to look for."
   echo ""
   echo "-c, --callback        (optional) Bash command to execute as a callback. This is useful for interacting with bitcoind before it is killed (to run tests, for example)."
   echo "-p, --params          (optional) Parameters to provide to bitcoind."
   echo ""
   echo "Environment Variables:"
   echo "BITCOIND              Default: ${DEFAULT_BITCOIND}"
   echo "LOG_FILE              Default: ${DEFAULT_LOG_FILE}"
   set -x
 }
 
 : "${BITCOIND:=${DEFAULT_BITCOIND}}"
 : "${LOG_FILE:=${DEFAULT_LOG_FILE}}"
 GREP_PATTERN=""
 CALLBACK=""
 BITCOIND_PARAMS=""
 
 # Parse command line arguments
 while [[ $# -gt 0 ]]; do
 case $1 in
   -h|--help)
     help_message
     exit 0
     ;;
 
   # Required params
   -g|--grep)
     GREP_PATTERN="$2"
     shift # shift past argument
     shift # shift past value
     ;;
 
   # Optional params
   -c|--callback)
     CALLBACK="$2"
     shift # shift past argument
     shift # shift past value
     ;;
   -p|--params)
     BITCOIND_PARAMS="$2"
     shift # shift past argument
     shift # shift past value
     ;;
 
   *)
     echo "Unknown argument: $1"
     help_message
     exit 1
     ;;
 esac
 done
 
 if [ -z "${GREP_PATTERN}" ]; then
   echo "Error: A grep pattern was not specified."
   echo ""
   help_message
   exit 2
 fi
 
 # Make sure the debug log exists so that tail does not fail
 touch "${LOG_FILE}"
 
 # Launch bitcoind using custom parameters
 read -a BITCOIND_PARAMS <<< "${BITCOIND_PARAMS}"
 
 BITCOIND_PID_FILE=/tmp/bitcoind-exit-on-log.pid
 # Make sure the PID file doesn't already exist for some reason
 rm -f "${BITCOIND_PID_FILE}"
 BITCOIND_PARAMS+=("-pid=${BITCOIND_PID_FILE}")
 BITCOIND_PARAMS+=("-daemon")
 
 START_TIME=$(date +%s)
 "${BITCOIND}" "${BITCOIND_PARAMS[@]}"
 
 # The PID file will not exist immediately, so wait for it
 PID_WAIT_COUNT=0
 while [ ! -e "${BITCOIND_PID_FILE}" ]; do
   ((PID_WAIT_COUNT+=1))
   if [ "${PID_WAIT_COUNT}" -gt 10 ]; then
     echo "Timed out waiting for bitcoind PID file"
     exit 10
   fi
   sleep 0.5
 done
 BITCOIND_PID=$(cat "${BITCOIND_PID_FILE}")
 
 # Wait for log checking to finish and kill the daemon
 (
   # When this subshell finishes, kill bitcoind
+  # shellcheck disable=SC2317
   log_subshell_cleanup() {
     echo "Cleaning up bitcoin daemon (PID: ${BITCOIND_PID})."
     kill ${BITCOIND_PID}
   }
   trap "log_subshell_cleanup" EXIT
 
   (
     # Ignore the broken pipe when tail tries to write pipe closed by grep
     set +o pipefail
     tail -f "${LOG_FILE}" | grep -m 1 "${GREP_PATTERN}"
   )
 
   END_TIME=$(date +%s)
   RUNTIME=$((END_TIME - START_TIME))
   HUMAN_RUNTIME=$(eval "echo $(date -ud "@${RUNTIME}" "+\$((%s/3600)) hours, %M minutes, %S seconds")")
 
   echo "Grep pattern '${GREP_PATTERN}' found after ${HUMAN_RUNTIME}."
 
   # Optional callback for interacting with bitcoind before it's killed
   if [ -n "${CALLBACK}" ]; then
     "${CALLBACK}"
   fi
 ) &
 LOG_PID=$!
 
 # Wait for bitcoind to exit, whether it exited on its own or the log subshell finished
 set +x
 while [ -e "${BITCOIND_PID_FILE}" ]; do sleep 0.5; done
 set -x
 
 # If the log subshell is still running, then GREP_PATTERN was not found
 if [ -e /proc/${LOG_PID} ]; then
   echo "bitcoind exited unexpectedly. See '${LOG_FILE}' for details."
   exit 20
 fi
 
 # Get the exit code for the log subshell, which should have exited already
 # if GREP_PATTERN was found
 wait ${LOG_PID}
 LOG_EXIT_CODE=$?
 
 # The log subshell should only exit with a non-zero code if the callback
 # failed.
 if [ "${LOG_EXIT_CODE}" -ne "0" ]; then
   echo "Log subshell failed with code: ${LOG_EXIT_CODE}"
   exit ${LOG_EXIT_CODE}
 fi
diff --git a/contrib/source-control-tools/autopatch.sh b/contrib/source-control-tools/autopatch.sh
index e5e96b0b1..8b806aa3a 100755
--- a/contrib/source-control-tools/autopatch.sh
+++ b/contrib/source-control-tools/autopatch.sh
@@ -1,104 +1,103 @@
 #!/usr/bin/env bash
 # Copyright (c) 2019-2020 The Bitcoin developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 export LC_ALL=C.UTF-8
 
 set -euxo pipefail
 
 # --force is necessary to skip the "sanity check" step, which conflicts with
 # stacked revisions that contain already-landed dependencies.
 DEFAULT_PATCH_ARGS="--skip-dependencies --force --nobranch"
 DEFAULT_REMOTE="origin"
 DEFAULT_BRANCH="master"
 
 help_message() {
   cat <<EOF
 Apply a patch from Phabricator cleanly on latest master.
 
 Options:
   -b, --branch              The git branch to fetch and rebase onto. Default: '${DEFAULT_BRANCH}'
   -h, --help                Display this help message.
   -o, --remote              The git remote to fetch latest from. Default: '${DEFAULT_REMOTE}'
   -p, --patch-args          Args to pass to 'arc patch'. Default: '${DEFAULT_PATCH_ARGS}'
   -r, --revision            The Differential revision ID used in Phabricator that you want to land. (ex: D1234)
                               This argument is required if --patch-args does not specify a revision or diff ID.
 EOF
 }
 
 BRANCH="${DEFAULT_BRANCH}"
 PATCH_ARGS="${DEFAULT_PATCH_ARGS}"
 REMOTE="${DEFAULT_REMOTE}"
 REVISION=""
 
 # Parse command line arguments
 while [[ $# -gt 0 ]]; do
 case $1 in
   -b|--branch)
     BRANCH="$2"
     shift # shift past argument
     shift # shift past value
     ;;
   -h|--help)
     help_message
     exit 0
-    shift # shift past argument
     ;;
   -o|--remote)
     REMOTE="$2"
     shift # shift past argument
     shift # shift past value
     ;;
   -p|--patch-args)
     PATCH_ARGS="$2"
     shift # shift past argument
     shift # shift past value
     ;;
   -r|--revision)
     REVISION="$2"
     shift # shift past argument
     shift # shift past value
     ;;
   *)
     echo "Unknown argument: $1"
     help_message
     exit 1
-    shift # shift past argument
     ;;
 esac
 done
 
 PATCH_ARGS="${REVISION} ${PATCH_ARGS}"
 
 # Make sure there are no unstaged changes, just in case this script is being run locally
 if [ -n "$(git status --porcelain)" ]; then
   echo "Error: The source tree has unexpected changes. Clean up any changes (try 'git stash') and try again."
   exit 10
 fi
 
 # Fetch and checkout latest changes, bailing if the branch isn't an ancestor of the remote branch.
 REMOTE_AND_BRANCH="${REMOTE}/${BRANCH}"
 git fetch "${REMOTE}" "${BRANCH}"
 git checkout "${BRANCH}"
 git merge-base --is-ancestor "${BRANCH}" "${REMOTE_AND_BRANCH}" || {
   echo "Error: Branch '${BRANCH}' is not an ancestor of '${REMOTE_AND_BRANCH}'"
   exit 11
 }
 git pull "${REMOTE}" "${BRANCH}"
 
 (
   # If arc fails, there may be a dangling branch. Clean it up before exiting.
+  # shellcheck disable=SC2317
   cleanup() {
     CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
     git checkout "${BRANCH}"
     git branch -D "${CURRENT_BRANCH}" || true
   }
   trap "cleanup" ERR
 
   # Note: `: | arc ...` pipes an empty string to stdin incase arcanist prompts
   # for user input. This fails and is treated as an error.
   : | arc patch ${PATCH_ARGS}
 )
 
 git rebase "${BRANCH}"