From 0dc3e828299f80e805fe20f91f7e37b1215b534b Mon Sep 17 00:00:00 2001 From: Felix Althaus Date: Wed, 31 Jul 2024 14:28:56 +0200 Subject: [PATCH] [TASK] Split COMMAND variable to be type strict (#1415) Fixes #1418 --- Build/Scripts/runTests.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh index ec39045..4a3868b 100755 --- a/Build/Scripts/runTests.sh +++ b/Build/Scripts/runTests.sh @@ -499,13 +499,13 @@ case ${TEST_SUITE} in cleanTestFiles ;; composer) - COMMAND=(composer "$@") - ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-command-${SUFFIX} -e COMPOSER_CACHE_DIR=.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} "${COMMAND[@]}" + COMMAND_PARTS=(composer "$@") + ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-command-${SUFFIX} -e COMPOSER_CACHE_DIR=.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} "${COMMAND_PARTS[@]}" SUITE_EXIT_CODE=$? ;; composerInstall) - COMMAND=(composer install "$@") - ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-install-${SUFFIX} -e COMPOSER_CACHE_DIR=.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} "${COMMAND[@]}" + COMMAND_PARTS=(composer install "$@") + ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-install-${SUFFIX} -e COMPOSER_CACHE_DIR=.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} "${COMMAND_PARTS[@]}" SUITE_EXIT_CODE=$? ;; composerInstallMax) @@ -612,8 +612,8 @@ case ${TEST_SUITE} in SUITE_EXIT_CODE=$? ;; npm) - COMMAND="npm $@" - ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name npm-command-${SUFFIX} ${IMAGE_NODE} /bin/sh -c "${COMMAND}" + COMMAND_PARTS=(npm "$@") + ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name npm-command-${SUFFIX} ${IMAGE_NODE} "${COMMAND_PARTS[@]}" SUITE_EXIT_CODE=$? ;; phpstan)