remove the shopware-version parameter from $@ because we don't want to pass it to docker-command

Author: Matthias Alt

bin/sdTest.sh

@@ -1,6 +1,17 @@
 #!/usr/bin/env bash
 
-SHOPWARE_VERSION=$1
+SHOPWARE_VERSION=$2
+
+# Remove Shopware-Version from `$@`, so it is not passed to docker-compose command
+for arg do
+  shift
+  case $arg in
+    (52|53|54|55) : ;;
+       (*) set -- "$@" "$arg" ;;
+
+  esac
+done
+
 
 if [ -z "${SHOPWARE_VERSION}" ]; then
     echo "You must provide the version of shopware you want to interact with, e.g. 54 for shopware 5.4"
@@ -31,7 +42,7 @@ fi
 export PROJECT_DIR="$( dirname $( dirname $( dirname "${PACKAGE_DIR}") ) )"
 export PACKAGE_DIR="${PACKAGE_DIR}"
 export PROJECT_NAME="$( basename ${PROJECT_DIR} | tr '[:upper:]' '[:lower:]' )"
-export DOCKER_COMPOSE_YAML=${PROJECT_DIR}"/etc/test/docker-compose.yml"
+export DOCKER_COMPOSE_YAML=${PROJECT_DIR}"/etc/test/docker-compose${SHOPWARE_VERSION}.yml"
 
 if [ "$1" != "init" ]; then
     source ${PACKAGE_DIR}/etc/scripts/checkSdTestEnvironment.sh
@@ -71,7 +82,7 @@ function init_environment {
     cp ${PACKAGE_DIR}/README.md ${PROJECT_DIR}/README.TESTING.md
 
     echo "Copying docker-compose.yml to be able to easily modify it for special needs"
-    cp ${PACKAGE_DIR}/docker-compose${SHOPWARE_VERSION}.yml ${PROJECT_DIR}/etc/test/docker-compose.yml
+    cp ${PACKAGE_DIR}/docker-compose${SHOPWARE_VERSION}.yml ${PROJECT_DIR}/etc/test/docker-compose${SHOPWARE_VERSION}.yml
 
     echo "Copying config files to be able to easily modify it for special needs"
     cp ${PACKAGE_DIR}/php/* ${PROJECT_DIR}/etc/test/php
@@ -181,6 +192,6 @@ case "$1" in
         get_logs $@
         ;;
     *)
-        echo "usage: init/start/stop/run/restart/build/reset/remove/pull/logs"
+        echo "usage: init/start/stop/run/restart/build/reset/remove/pull/logs <Shopware-Version, e.g. 54 for shopware 5.4>"
         ;;
 esac