Shellcheck fixes

Author: jgarber623-cargosense

src/node/install.sh

@@ -7,7 +7,7 @@ NODE_MAJOR_VERSION="24"
 
 pkg="nodejs"
 
-if [ "${NODE_VERSION}" != "automatic" ]; then
+if [[ "${NODE_VERSION}" != "automatic" ]]; then
   NODE_MAJOR_VERSION="$(echo "${NODE_VERSION}" | cut -d. -f1)"
   pkg="${pkg}=${NODE_VERSION}-1nodesource1"
 fi
@@ -42,12 +42,12 @@ install -dm 755 /etc/apt/keyrings
 curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
 echo "${apt_sources_snippet}" | tee /etc/apt/sources.list.d/nodesource.sources
 
-if [ -n "${curl_installed}" ]; then
+if [[ -n "${curl_installed}" ]]; then
   apt purge curl --autoremove --yes
   rm -rf /var/lib/apt/lists/*
 fi
 
-if [ -n "${gpg_installed}" ]; then
+if [[ -n "${gpg_installed}" ]]; then
   apt purge gnupg --autoremove --yes
   rm -rf /var/lib/apt/lists/*
 fi
@@ -65,6 +65,6 @@ if [[ "$(cat /etc/bash.bashrc)" != *"${node_rc_snippet}"* ]]; then
   echo "${node_rc_snippet}" >> /etc/bash.bashrc
 fi
 
-if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"${node_rc_snippet}"* ]]; then
+if [[ -f "/etc/zsh/zshrc" ]] && [[ "$(cat /etc/zsh/zshrc)" != *"${node_rc_snippet}"* ]]; then
   echo "${node_rc_snippet}" >> /etc/zsh/zshrc
 fi

src/postgresql-client/install.sh

@@ -36,10 +36,10 @@ fi
 
 install -d /usr/share/postgresql-common/pgdg
 curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc
-sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt '${VERSION_CODENAME}'-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt ${VERSION_CODENAME}-pgdg main" > /etc/apt/sources.list.d/pgdg.list
 
 apt update --yes
-apt install --no-install-recommends --yes libpq-dev postgresql-client-${POSTGRESQL_VERSION}
+apt install --no-install-recommends --yes libpq-dev postgresql-client-"${POSTGRESQL_VERSION}"
 
 if [ -n "${curl_installed}" ]; then
   apt purge curl --autoremove --yes

test/postgresql-client/postgresql-client-15.sh

@@ -1,46 +1,13 @@
 #!/usr/bin/env bash
 
-# This test file will be executed against an auto-generated devcontainer.json that
-# includes the 'postgresql-client' 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": {
-#      "postgresql-client": {}
-#    },
-#    "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 postgresql-client   \
-#               --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.
+# 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 "psql --version | grep -E 'psql \(PostgreSQL\) 15\..+'"
 
 # Report result
-# If any of the checks above exited with a non-zero exit code, the test will fail.
 reportResults

test/postgresql-client/test.sh

@@ -1,47 +1,14 @@
 #!/usr/bin/env bash
 
-# This test file will be executed against an auto-generated devcontainer.json that
-# includes the 'postgresql-client' 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": {
-#      "postgresql-client": {}
-#    },
-#    "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 postgresql-client   \
-#               --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.
+# 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" psql --version
 check "which psql" bash -c "which psql | grep /usr/bin/psql"
 
 # Report result
-# If any of the checks above exited with a non-zero exit code, the test will fail.
 reportResults