From 986bad8f9080150236a60f8dd8d01be9ded0825d Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulip.com>
Date: Wed, 4 Jan 2023 12:11:33 -0800
Subject: [PATCH] install-shellcheck: Upgrade ShellCheck to 0.9.0.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
---
 scripts/setup/setup-certbot    |  5 +++--
 tools/setup/install-shellcheck |  6 +++---
 tools/test-all                 | 15 ++++++++-------
 version.py                     |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/scripts/setup/setup-certbot b/scripts/setup/setup-certbot
index 610365ce7d..2c91a6c554 100755
--- a/scripts/setup/setup-certbot
+++ b/scripts/setup/setup-certbot
@@ -18,6 +18,7 @@ fi
 method=webroot
 args="$(getopt -o '' --long help,email:,method:,skip-symlink,agree-tos -n "$0" -- "$@")"
 eval "set -- $args"
+agree_tos=()
 while true; do
     case "$1" in
         --email)
@@ -35,7 +36,7 @@ while true; do
             shift
             ;;
         --agree-tos)
-            agree_tos=--agree-tos
+            agree_tos=(--agree-tos)
             shift
             ;;
         --help)
@@ -106,7 +107,7 @@ esac
 # an annoying prompt we stifle with --no-eff-email.
 certbot certonly "${method_args[@]}" \
     "${HOSTNAMES[@]}" -m "$EMAIL" \
-    $agree_tos \
+    "${agree_tos[@]}" \
     --force-interactive --no-eff-email
 
 symlink_with_backup() {
diff --git a/tools/setup/install-shellcheck b/tools/setup/install-shellcheck
index f9fa95e162..1fec01d67c 100755
--- a/tools/setup/install-shellcheck
+++ b/tools/setup/install-shellcheck
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 set -eu
 
-version=0.8.0
+version=0.9.0
 arch="$(uname -m)"
 tarball="shellcheck-v$version.linux.$arch.tar.xz"
 declare -A sha256=(
-    [aarch64]=9f47bbff5624babfa712eb9d64ece14c6c46327122d0c54983f627ae3a30a4ac
-    [x86_64]=ab6ee1b178f014d1b86d1e24da20d1139656c8b0ed34d2867fbb834dad02bf0a
+    [aarch64]=179c579ef3481317d130adebede74a34dbbc2df961a70916dd4039ebf0735fae
+    [x86_64]=700324c6dd0ebea0117591c6cc9d7350d9c7c5c287acbad7630fa17b1d4d9e2f
 )
 
 check_version() {
diff --git a/tools/test-all b/tools/test-all
index 23c4d8de15..649fc56e9c 100755
--- a/tools/test-all
+++ b/tools/test-all
@@ -8,10 +8,11 @@ TEMP=$(getopt -o "" --long skip-provision-check -- "$@")
 eval set -- "$TEMP"
 
 # extract options.
+forcearg=()
 while true; do
     case "$1" in
         --skip-provision-check)
-            FORCEARG="--skip-provision-check"
+            forcearg=(--skip-provision-check)
             shift
             ;;
         --)
@@ -45,12 +46,12 @@ printf '\e[0m'
 echo
 
 # prep
-run ./tools/check-provision $FORCEARG
+run ./tools/check-provision "${forcearg[@]}"
 
 # ci/backend
-run ./tools/lint --groups=backend $FORCEARG
+run ./tools/lint --groups=backend "${forcearg[@]}"
 run ./tools/test-tools
-run ./tools/test-backend --include-webhooks --ban-console-output $FORCEARG
+run ./tools/test-backend --include-webhooks --ban-console-output "${forcearg[@]}"
 run ./tools/test-migrations
 # Not running SVG optimizing since it's low-churn
 # run ./tools/setup/optimize-svg
@@ -58,7 +59,7 @@ run ./tools/test-migrations
 # ./tools/setup/generate_integration_bots_avatars.py --check-missing
 # Not running documentation tests since it takes 20s and only tests documentation
 # run ./tools/test-documentation --skip-external-links
-run ./tools/test-help-documentation --skip-external-links $FORCEARG
+run ./tools/test-help-documentation --skip-external-links "${forcearg[@]}"
 run ./tools/test-api
 # Not running requirements check locally, because slow and low-churn
 # run ./tools/test-locked-requirements
@@ -68,12 +69,12 @@ run ./tools/test-api
 # run ./tools/test-queue-worker-reload
 
 # ci/frontend
-run ./tools/lint --groups=frontend $FORCEARG
+run ./tools/lint --groups=frontend "${forcearg[@]}"
 run ./tools/test-js-with-node
 run ./tools/check-schemas
 run ./manage.py makemessages --locale en
 run env PYTHONWARNINGS=ignore ./tools/check-capitalization --no-generate
 run env PYTHONWARNINGS=ignore ./tools/check-frontend-i18n --no-generate
-run ./tools/test-js-with-puppeteer $FORCEARG
+run ./tools/test-js-with-puppeteer "${forcearg[@]}"
 
 printf '\n\e[32mAll OK!\e[0m\n'
diff --git a/version.py b/version.py
index ab1267889f..8e19e956dd 100644
--- a/version.py
+++ b/version.py
@@ -48,4 +48,4 @@ API_FEATURE_LEVEL = 159
 #   historical commits sharing the same major version, in which case a
 #   minor version bump suffices.
 
-PROVISION_VERSION = (217, 1)
+PROVISION_VERSION = (218, 0)