From f309e1f17926a7dc27c854dda26981946f38c241 Mon Sep 17 00:00:00 2001
From: Jason Garber <jason.garber@cargosense.com>
Date: Thu, 29 Feb 2024 14:42:50 +0000
Subject: [PATCH 01/10] Add ShellCheck feature

---
 .shellcheckrc                            |  5 +++
 src/shellcheck/README.md                 | 15 ++++++++
 src/shellcheck/devcontainer-feature.json | 10 +++++
 src/shellcheck/install.sh                | 11 ++++++
 test/shellcheck/test.sh                  | 47 ++++++++++++++++++++++++
 5 files changed, 88 insertions(+)
 create mode 100644 .shellcheckrc
 create mode 100644 src/shellcheck/README.md
 create mode 100644 src/shellcheck/devcontainer-feature.json
 create mode 100755 src/shellcheck/install.sh
 create mode 100755 test/shellcheck/test.sh

diff --git a/.shellcheckrc b/.shellcheckrc
new file mode 100644
index 0000000..6087444
--- /dev/null
+++ b/.shellcheckrc
@@ -0,0 +1,5 @@
+# Enable all optional checks
+enable=all
+
+# Follow source statements even when the file is not specified as input
+external-sources=true
diff --git a/src/shellcheck/README.md b/src/shellcheck/README.md
new file mode 100644
index 0000000..dd33274
--- /dev/null
+++ b/src/shellcheck/README.md
@@ -0,0 +1,15 @@
+# shellcheck
+
+Install [ShellCheck](https://www.shellcheck.net), a static analysis tool for shell scripts.
+
+## Usage
+
+```json
+"features": {
+  "ghcr.io/CargoSense/devcontainer-features/shellcheck:1": {}
+}
+```
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu and Linux distributions using the [apt](https://wiki.debian.org/AptCLI) management tool.
diff --git a/src/shellcheck/devcontainer-feature.json b/src/shellcheck/devcontainer-feature.json
new file mode 100644
index 0000000..bb1cf80
--- /dev/null
+++ b/src/shellcheck/devcontainer-feature.json
@@ -0,0 +1,10 @@
+{
+    "name": "ShellCheck",
+    "id": "shellcheck",
+    "version": "1.0.0",
+    "description": "Install ShellCheck, a static analysis tool for shell scripts.",
+    "installsAfter": [
+      "ghcr.io/devcontainers/features/common-utils"
+    ]
+  }
+  
\ No newline at end of file
diff --git a/src/shellcheck/install.sh b/src/shellcheck/install.sh
new file mode 100755
index 0000000..28ec4de
--- /dev/null
+++ b/src/shellcheck/install.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+set -e
+
+if [ "$(id -u)" -ne 0 ]; then
+  printf 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
+  exit 1
+fi
+
+apt update --yes
+apt install --no-install-recommends --yes shellcheck
diff --git a/test/shellcheck/test.sh b/test/shellcheck/test.sh
new file mode 100755
index 0000000..1a6d5f2
--- /dev/null
+++ b/test/shellcheck/test.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+# This test file will be executed against an auto-generated devcontainer.json that
+# includes the 'shellcheck' Feature with no options.
+#
+# For more information, see: https://github.com/devcontainers/cli/blob/main/docs/features/test.md
+#
+# Eg:
+# {
+#    "image": "<..some-base-image...>",
+#    "features": {
+#      "shellcheck": {}
+#    },
+#    "remoteUser": "root"
+# }
+#
+# Thus, the value of all options will fall back to the default value in the
+# Feature's 'devcontainer-feature.json'.
+#
+# These scripts are run as 'root' by default. Although that can be changed
+# with the '--remote-user' flag.
+#
+# This test can be run with the following command:
+#
+#    devcontainer features test    \
+#               --features shellcheck   \
+#               --remote-user root \
+#               --skip-scenarios   \
+#               --base-image mcr.microsoft.com/devcontainers/base:ubuntu \
+#               /path/to/this/repo
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+check "version" shellcheck --version
+check "which shellcheck" bash -c "which shellcheck | grep /usr/bin/shellcheck"
+
+# Report result
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults

From b8a1329900efe153260c1cb35f09d3dcbf04b1e3 Mon Sep 17 00:00:00 2001
From: Jason Garber <jason.garber@cargosense.com>
Date: Thu, 29 Feb 2024 14:48:27 +0000
Subject: [PATCH 02/10] Ignore external source

---
 test/shellcheck/test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/shellcheck/test.sh b/test/shellcheck/test.sh
index 1a6d5f2..d6d1870 100755
--- a/test/shellcheck/test.sh
+++ b/test/shellcheck/test.sh
@@ -34,6 +34,7 @@ set -e
 # Optional: Import test library bundled with the devcontainer CLI
 # See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
 # Provides the 'check' and 'reportResults' commands.
+# shellcheck source=/dev/null
 source dev-container-features-test-lib
 
 # Feature-specific tests

From 121c535e1e9634da69b1db6d5a9d7e802ee94bf5 Mon Sep 17 00:00:00 2001
From: Jason Garber <jason.garber@cargosense.com>
Date: Thu, 29 Feb 2024 13:46:47 -0500
Subject: [PATCH 03/10] Refactor script to support version and install path

---
 src/shellcheck/README.md                 |  9 +++++
 src/shellcheck/devcontainer-feature.json | 12 +++++-
 src/shellcheck/install.sh                | 47 ++++++++++++++++++++++--
 3 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/src/shellcheck/README.md b/src/shellcheck/README.md
index dd33274..d5dce07 100644
--- a/src/shellcheck/README.md
+++ b/src/shellcheck/README.md
@@ -10,6 +10,15 @@ Install [ShellCheck](https://www.shellcheck.net), a static analysis tool for she
 }
 ```
 
+## Options
+
+| Option ID     | Description                                  | Type   | Default Value    |
+|:--------------|:---------------------------------------------|:-------|:-----------------|
+| `version`     | The ShellCheck version to install.           | string | `os-provided`    |
+| `installPath` | The path where ShellCheck will be installed. | string | `/usr/local/bin` |
+
 ## OS Support
 
 This Feature should work on recent versions of Debian/Ubuntu and Linux distributions using the [apt](https://wiki.debian.org/AptCLI) management tool.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/shellcheck/devcontainer-feature.json b/src/shellcheck/devcontainer-feature.json
index bb1cf80..4b5e28e 100644
--- a/src/shellcheck/devcontainer-feature.json
+++ b/src/shellcheck/devcontainer-feature.json
@@ -3,8 +3,18 @@
     "id": "shellcheck",
     "version": "1.0.0",
     "description": "Install ShellCheck, a static analysis tool for shell scripts.",
+    "options": {
+      "version": {
+        "type": "string",
+        "proposals": [
+          "latest",
+          "os-provided"
+        ],
+        "default": "os-provided",
+        "description": "Select or enter a ShellCheck version."
+      }
+    },
     "installsAfter": [
       "ghcr.io/devcontainers/features/common-utils"
     ]
   }
-  
\ No newline at end of file
diff --git a/src/shellcheck/install.sh b/src/shellcheck/install.sh
index 28ec4de..98cc4fb 100755
--- a/src/shellcheck/install.sh
+++ b/src/shellcheck/install.sh
@@ -1,11 +1,52 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -e
 
+SHELLCHECK_VERSION="${VERSION:-"os-provided"}"
+INSTALL_PATH="${INSTALLPATH:-"/usr/local/bin"}"
+
 if [ "$(id -u)" -ne 0 ]; then
   printf 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
   exit 1
 fi
 
-apt update --yes
-apt install --no-install-recommends --yes shellcheck
+
+if [ "${SHELLCHECK_VERSION}" = "os-provided" ]; then
+  apt update --yes
+  apt install --no-install-recommends --yes shellcheck
+
+  exit 0
+fi
+
+curl_installed=""
+
+if ! type curl >/dev/null 2>&1; then
+  apt update --yes
+  apt install --no-install-recommends --yes curl ca-certificates
+
+  curl_installed="true"
+fi
+
+if [ "${SHELLCHECK_VERSION}" = "latest" ]; then
+  SHELLCHECK_VERSION=$(curl -s --head https://github.com/koalaman/shellcheck/releases/latest | sed -nr 's/location:.*\/v(.+)/\1/ip' | tr -d '\r')
+fi
+
+machine="$(uname -m)"
+case "${machine}" in
+  aarch64) arch="aarch64" ;;
+  arm*) arch="armv6" ;;
+  x86_64) arch="x86_64" ;;
+  *)
+    echo "Could not determine arch from machine hardware name '${machine}'" >&2
+    exit 1
+  ;;
+esac
+
+# https://github.com/koalaman/shellcheck/releases/download/v0.9.0/shellcheck-v0.9.0.linux.aarch64.tar.xz
+url="https://github.com/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/shellcheck-v${SHELLCHECK_VERSION}.linux.${arch}.tar.xz"
+
+curl -sSL "${url}" | tar --strip-components=1 -Jxvf - -C "${INSTALL_PATH}" "shellcheck-v${SHELLCHECK_VERSION}/shellcheck"
+
+if [ -n "${curl_installed}" ]; then
+  apt purge curl --autoremove --yes
+fi

From 55345341a2f808b6eb2eb00837de9580a188c7c1 Mon Sep 17 00:00:00 2001
From: Jason Garber <jason.garber@cargosense.com>
Date: Thu, 29 Feb 2024 13:47:09 -0500
Subject: [PATCH 04/10] Add more shellcheck tests

---
 test/shellcheck/scenarios.json             | 19 +++++++++++++++++++
 test/shellcheck/shellcheck-install-path.sh | 18 ++++++++++++++++++
 test/shellcheck/shellcheck-version.sh      | 18 ++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 test/shellcheck/scenarios.json
 create mode 100755 test/shellcheck/shellcheck-install-path.sh
 create mode 100755 test/shellcheck/shellcheck-version.sh

diff --git a/test/shellcheck/scenarios.json b/test/shellcheck/scenarios.json
new file mode 100644
index 0000000..96a9823
--- /dev/null
+++ b/test/shellcheck/scenarios.json
@@ -0,0 +1,19 @@
+{
+  "shellcheck-version": {
+    "image": "debian:latest",
+    "features": {
+      "shellcheck": {
+        "version": "0.5.0"
+      }
+    }
+  },
+
+  "shellcheck-install-path": {
+    "image": "debian:latest",
+    "features": {
+      "shellcheck": {
+        "installPath": "/usr/bin"
+      }
+    }
+  }
+}
diff --git a/test/shellcheck/shellcheck-install-path.sh b/test/shellcheck/shellcheck-install-path.sh
new file mode 100755
index 0000000..e515248
--- /dev/null
+++ b/test/shellcheck/shellcheck-install-path.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
+# shellcheck source=/dev/null
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+check "which shellcheck" bash -c "which shellcheck | grep /usr/bin/shellcheck"
+
+# Report result
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults
diff --git a/test/shellcheck/shellcheck-version.sh b/test/shellcheck/shellcheck-version.sh
new file mode 100755
index 0000000..fc0f6bd
--- /dev/null
+++ b/test/shellcheck/shellcheck-version.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
+# shellcheck source=/dev/null
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+check "version" bash -c "shellcheck --version | grep 0.5.0"
+
+# Report result
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults

From 1919404ec3e757fe0c34c345ebab51a43de470f6 Mon Sep 17 00:00:00 2001
From: Jason Garber <jason.garber@cargosense.com>
Date: Thu, 29 Feb 2024 13:51:08 -0500
Subject: [PATCH 05/10] Test additional features

---
 .github/workflows/test.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e934ae8..a73003e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,6 +13,8 @@ jobs:
       matrix:
         features:
           - actionlint
+          - postgresql-client
+          - shellcheck
         baseImage:
           - debian:latest
           - ubuntu:latest
@@ -29,6 +31,8 @@ jobs:
       matrix:
         features:
           - actionlint
+          - postgresql-client
+          - shellcheck
     continue-on-error: true
     steps:
       - uses: actions/checkout@v4

From c246e4a4542ba1ac985865a94f533f9a3682c636 Mon Sep 17 00:00:00 2001
From: Jason Garber <jason.garber@cargosense.com>
Date: Thu, 29 Feb 2024 14:06:37 -0500
Subject: [PATCH 06/10] Address some shellcheck issues

---
 src/shellcheck/install.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/shellcheck/install.sh b/src/shellcheck/install.sh
index 98cc4fb..c92459e 100755
--- a/src/shellcheck/install.sh
+++ b/src/shellcheck/install.sh
@@ -5,13 +5,13 @@ set -e
 SHELLCHECK_VERSION="${VERSION:-"os-provided"}"
 INSTALL_PATH="${INSTALLPATH:-"/usr/local/bin"}"
 
-if [ "$(id -u)" -ne 0 ]; then
+if [[ "$(id -u)" -ne 0 ]]; then
   printf 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
   exit 1
 fi
 
 
-if [ "${SHELLCHECK_VERSION}" = "os-provided" ]; then
+if [[ "${SHELLCHECK_VERSION}" = "os-provided" ]]; then
   apt update --yes
   apt install --no-install-recommends --yes shellcheck
 
@@ -27,8 +27,8 @@ if ! type curl >/dev/null 2>&1; then
   curl_installed="true"
 fi
 
-if [ "${SHELLCHECK_VERSION}" = "latest" ]; then
-  SHELLCHECK_VERSION=$(curl -s --head https://github.com/koalaman/shellcheck/releases/latest | sed -nr 's/location:.*\/v(.+)/\1/ip' | tr -d '\r')
+if [[ "${SHELLCHECK_VERSION}" = "latest" ]]; then
+  SHELLCHECK_VERSION="$(curl -s --head https://github.com/koalaman/shellcheck/releases/latest | sed -nr 's/location:.*\/v(.+)/\1/ip' | tr -d '\r')"
 fi
 
 machine="$(uname -m)"
@@ -47,6 +47,6 @@ url="https://github.com/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERS
 
 curl -sSL "${url}" | tar --strip-components=1 -Jxvf - -C "${INSTALL_PATH}" "shellcheck-v${SHELLCHECK_VERSION}/shellcheck"
 
-if [ -n "${curl_installed}" ]; then
+if [[ -n "${curl_installed}" ]]; then
   apt purge curl --autoremove --yes
 fi

From 4592b9882e42dbbc1f48e1927293083a7c84c5cf Mon Sep 17 00:00:00 2001
From: Jason Garber <jason.garber@cargosense.com>
Date: Thu, 29 Feb 2024 19:48:10 +0000
Subject: [PATCH 07/10] Disable check-extra-masked-returns

---
 .shellcheckrc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.shellcheckrc b/.shellcheckrc
index 6087444..c0cc574 100644
--- a/.shellcheckrc
+++ b/.shellcheckrc
@@ -3,3 +3,7 @@ enable=all
 
 # Follow source statements even when the file is not specified as input
 external-sources=true
+
+# Disable check-extra-masked-returns
+# https://www.shellcheck.net/wiki/SC2312
+disable=SC2312

From db0eb357119265f352e9bf8a15467db62aa6f207 Mon Sep 17 00:00:00 2001
From: Jason Garber <jason.garber@cargosense.com>
Date: Thu, 29 Feb 2024 20:02:53 +0000
Subject: [PATCH 08/10] Use suitable base images in tests

---
 test/shellcheck/scenarios.json        | 6 +++---
 test/shellcheck/shellcheck-version.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/shellcheck/scenarios.json b/test/shellcheck/scenarios.json
index 96a9823..212d183 100644
--- a/test/shellcheck/scenarios.json
+++ b/test/shellcheck/scenarios.json
@@ -1,15 +1,15 @@
 {
   "shellcheck-version": {
-    "image": "debian:latest",
+    "image": "mcr.microsoft.com/devcontainers/base:debian",
     "features": {
       "shellcheck": {
-        "version": "0.5.0"
+        "version": "0.7.0"
       }
     }
   },
 
   "shellcheck-install-path": {
-    "image": "debian:latest",
+    "image": "mcr.microsoft.com/devcontainers/base:debian",
     "features": {
       "shellcheck": {
         "installPath": "/usr/bin"
diff --git a/test/shellcheck/shellcheck-version.sh b/test/shellcheck/shellcheck-version.sh
index fc0f6bd..96a727e 100755
--- a/test/shellcheck/shellcheck-version.sh
+++ b/test/shellcheck/shellcheck-version.sh
@@ -11,7 +11,7 @@ source dev-container-features-test-lib
 # Feature-specific tests
 # The 'check' command comes from the dev-container-features-test-lib. Syntax is...
 # check <LABEL> <cmd> [args...]
-check "version" bash -c "shellcheck --version | grep 0.5.0"
+check "version" bash -c "shellcheck --version | grep 0.7.0"
 
 # Report result
 # If any of the checks above exited with a non-zero exit code, the test will fail.

From d10303d1998e61d3532b1bc148996e6c2e9290eb Mon Sep 17 00:00:00 2001
From: Jason Garber <jason.garber@cargosense.com>
Date: Thu, 29 Feb 2024 20:24:48 +0000
Subject: [PATCH 09/10] =?UTF-8?q?=F0=9F=A4=B7=F0=9F=8F=BB=E2=80=8D?=
 =?UTF-8?q?=E2=99=82=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/shellcheck/devcontainer-feature.json |  5 +++++
 src/shellcheck/install.sh                | 10 +++++-----
 test/shellcheck/scenarios.json           |  6 +++---
 test/shellcheck/shellcheck-version.sh    |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/shellcheck/devcontainer-feature.json b/src/shellcheck/devcontainer-feature.json
index 4b5e28e..204cc50 100644
--- a/src/shellcheck/devcontainer-feature.json
+++ b/src/shellcheck/devcontainer-feature.json
@@ -12,6 +12,11 @@
         ],
         "default": "os-provided",
         "description": "Select or enter a ShellCheck version."
+      },
+      "installPath": {
+        "type": "string",
+        "default": "/usr/local/bin",
+        "description": "The path where ShellCheck will be installed."
       }
     },
     "installsAfter": [
diff --git a/src/shellcheck/install.sh b/src/shellcheck/install.sh
index c92459e..c05e47c 100755
--- a/src/shellcheck/install.sh
+++ b/src/shellcheck/install.sh
@@ -1,17 +1,17 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 set -e
 
 SHELLCHECK_VERSION="${VERSION:-"os-provided"}"
 INSTALL_PATH="${INSTALLPATH:-"/usr/local/bin"}"
 
-if [[ "$(id -u)" -ne 0 ]]; then
+if [ "$(id -u)" -ne 0 ]; then
   printf 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
   exit 1
 fi
 
 
-if [[ "${SHELLCHECK_VERSION}" = "os-provided" ]]; then
+if [ "${SHELLCHECK_VERSION}" = "os-provided" ]; then
   apt update --yes
   apt install --no-install-recommends --yes shellcheck
 
@@ -27,7 +27,7 @@ if ! type curl >/dev/null 2>&1; then
   curl_installed="true"
 fi
 
-if [[ "${SHELLCHECK_VERSION}" = "latest" ]]; then
+if [ "${SHELLCHECK_VERSION}" = "latest" ]; then
   SHELLCHECK_VERSION="$(curl -s --head https://github.com/koalaman/shellcheck/releases/latest | sed -nr 's/location:.*\/v(.+)/\1/ip' | tr -d '\r')"
 fi
 
@@ -47,6 +47,6 @@ url="https://github.com/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERS
 
 curl -sSL "${url}" | tar --strip-components=1 -Jxvf - -C "${INSTALL_PATH}" "shellcheck-v${SHELLCHECK_VERSION}/shellcheck"
 
-if [[ -n "${curl_installed}" ]]; then
+if [ -n "${curl_installed}" ]; then
   apt purge curl --autoremove --yes
 fi
diff --git a/test/shellcheck/scenarios.json b/test/shellcheck/scenarios.json
index 212d183..e64f3c9 100644
--- a/test/shellcheck/scenarios.json
+++ b/test/shellcheck/scenarios.json
@@ -1,15 +1,15 @@
 {
   "shellcheck-version": {
-    "image": "mcr.microsoft.com/devcontainers/base:debian",
+    "image": "debian:latest",
     "features": {
       "shellcheck": {
-        "version": "0.7.0"
+        "version": "0.8.0"
       }
     }
   },
 
   "shellcheck-install-path": {
-    "image": "mcr.microsoft.com/devcontainers/base:debian",
+    "image": "debian:latest",
     "features": {
       "shellcheck": {
         "installPath": "/usr/bin"
diff --git a/test/shellcheck/shellcheck-version.sh b/test/shellcheck/shellcheck-version.sh
index 96a727e..59a26c3 100755
--- a/test/shellcheck/shellcheck-version.sh
+++ b/test/shellcheck/shellcheck-version.sh
@@ -11,7 +11,7 @@ source dev-container-features-test-lib
 # Feature-specific tests
 # The 'check' command comes from the dev-container-features-test-lib. Syntax is...
 # check <LABEL> <cmd> [args...]
-check "version" bash -c "shellcheck --version | grep 0.7.0"
+check "version" bash -c "shellcheck --version | grep 0.8.0"
 
 # Report result
 # If any of the checks above exited with a non-zero exit code, the test will fail.

From c960555282e10d900db2ed56d2f827c85882d040 Mon Sep 17 00:00:00 2001
From: Jason Garber <jason.garber@cargosense.com>
Date: Thu, 29 Feb 2024 21:14:29 +0000
Subject: [PATCH 10/10] Maybe xz-tools might not be installed

---
 src/shellcheck/install.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/shellcheck/install.sh b/src/shellcheck/install.sh
index c05e47c..93ebe4e 100755
--- a/src/shellcheck/install.sh
+++ b/src/shellcheck/install.sh
@@ -22,7 +22,7 @@ curl_installed=""
 
 if ! type curl >/dev/null 2>&1; then
   apt update --yes
-  apt install --no-install-recommends --yes curl ca-certificates
+  apt install --no-install-recommends --yes curl ca-certificates xz-utils
 
   curl_installed="true"
 fi
@@ -43,10 +43,11 @@ case "${machine}" in
 esac
 
 # https://github.com/koalaman/shellcheck/releases/download/v0.9.0/shellcheck-v0.9.0.linux.aarch64.tar.xz
-url="https://github.com/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/shellcheck-v${SHELLCHECK_VERSION}.linux.${arch}.tar.xz"
+file="shellcheck-v${SHELLCHECK_VERSION}.linux.${arch}.tar.xz"
+url="https://github.com/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/${file}"
 
 curl -sSL "${url}" | tar --strip-components=1 -Jxvf - -C "${INSTALL_PATH}" "shellcheck-v${SHELLCHECK_VERSION}/shellcheck"
 
 if [ -n "${curl_installed}" ]; then
-  apt purge curl --autoremove --yes
+  apt purge curl xz-utils --autoremove --yes
 fi