Skip to content

Commit ab2e97a

Browse files
author
Tobias Wojtylak
committed
Adjusted checkSdTestEnvironment.sh Check. Mind Shopware version
1 parent 06e9635 commit ab2e97a

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

bin/sdTest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export PROJECT_NAME="$( basename ${PROJECT_DIR} | tr '[:upper:]' '[:lower:]' )"
4545
export DOCKER_COMPOSE_YAML=${PROJECT_DIR}"/etc/test/docker-compose${SHOPWARE_VERSION}.yml"
4646

4747
if [ "$1" != "init" ]; then
48-
source ${PACKAGE_DIR}/etc/scripts/checkSdTestEnvironment.sh
48+
source ${PACKAGE_DIR}/etc/scripts/checkSdTestEnvironment.sh ${SHOPWARE_VERSION}
4949
fi
5050

5151

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
#!/usr/bin/env bash
22

3+
SHOPWARE_VERSION=$1
4+
35
if [ ! -d ${PROJECT_DIR} ]; then
46
echo "Project directory not found in \$PROJECT_DIR. Did you call this script correctly? Cancel."
57
exit 1
68
fi
79

8-
if [ ! -f ${PROJECT_DIR}/etc/test/docker-compose.yml ]; then
9-
echo "No docker-compose.yml file found under ${PROJECT_DIR}/etc/test/docker-compose.yml - Needed for docker setup. Cancel."
10-
echo "Perhaps forgot to run 'vendor/bin/sdTest.sh init'?"
10+
if [ ! -f ${PROJECT_DIR}/etc/test/docker-compose${SHOPWARE_VERSION}.yml ]; then
11+
echo "No docker-compose.yml file found under ${PROJECT_DIR}/etc/test/docker-compose${SHOPWARE_VERSION}.yml - Needed for docker setup. Cancel."
12+
echo "Perhaps forgot to run 'vendor/bin/sdTest.sh init [SHOPWARE_VERSION]'?"
1113
exit 1
1214
fi

0 commit comments

Comments
 (0)