From b2d6d3dbe7084a1a1b1c424668600dbf673639fa Mon Sep 17 00:00:00 2001 From: Christian Winther Date: Mon, 15 Jan 2024 17:23:32 +0000 Subject: [PATCH] implement automatic shellcheck linting --- .github/workflows/docker.yml | 1 + .../root/docker/install/php-extensions.sh | 20 +++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 79dae64e7..7127cdcbe 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -48,6 +48,7 @@ jobs: uses: ludeeus/action-shellcheck@master env: SHELLCHECK_OPTS: --shell=bash --external-sources + INPUT_ADDITIONAL_FILE_ARGS: -o -name '*.envsh' with: scandir: ./docker/ diff --git a/docker/shared/root/docker/install/php-extensions.sh b/docker/shared/root/docker/install/php-extensions.sh index baf460c80..86075ef1d 100755 --- a/docker/shared/root/docker/install/php-extensions.sh +++ b/docker/shared/root/docker/install/php-extensions.sh @@ -32,16 +32,20 @@ fi pecl install "${PHP_PECL_EXTENSIONS}" "${PHP_PECL_EXTENSIONS_EXTRA}" # PHP extensions (dependencies) +# +# shellcheck disable=SC2086 docker-php-ext-install \ -j "$(nproc)" \ - "${PHP_EXTENSIONS}" \ - "${PHP_EXTENSIONS_EXTRA}" \ - "${PHP_EXTENSIONS_DATABASE}" + ${PHP_EXTENSIONS} \ + ${PHP_EXTENSIONS_EXTRA} \ + ${PHP_EXTENSIONS_DATABASE} # Enable all extensions +# +# shellcheck disable=SC2086 docker-php-ext-enable \ - "${PHP_PECL_EXTENSIONS}" \ - "${PHP_PECL_EXTENSIONS_EXTRA}" \ - "${PHP_EXTENSIONS}" \ - "${PHP_EXTENSIONS_EXTRA}" \ - "${PHP_EXTENSIONS_DATABASE}" + ${PHP_PECL_EXTENSIONS} \ + ${PHP_PECL_EXTENSIONS_EXTRA} \ + ${PHP_EXTENSIONS} \ + ${PHP_EXTENSIONS_EXTRA} \ + ${PHP_EXTENSIONS_DATABASE}