From 872ae0d53677c3b320a30e67b489999b19d30b9f Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Mon, 28 Jan 2019 11:35:59 +0100
Subject: [PATCH] Ensure startup scripts are tested correctly

---
 .tests/startup-tests/startup.2.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.tests/startup-tests/startup.2.sh b/.tests/startup-tests/startup.2.sh
index 7a67b581..d9346d48 100755
--- a/.tests/startup-tests/startup.2.sh
+++ b/.tests/startup-tests/startup.2.sh
@@ -16,16 +16,15 @@ cd "${COMPOSEPATH}" && docker-compose exec -T php bash -c "find /startup.2.d/*.s
 	echo "# ----------------------------------------------------------------------------------------"
 	echo "# [TEST] ${f}"
 	echo "# ----------------------------------------------------------------------------------------"
-	if ! docker exec -t ${CONTAINER} bash "${f}" | grep -q "No projects defined"; then
+	if ! docker exec -t ${CONTAINER} bash "${f}"; then
 		sleep 5
-		if ! docker exec -t ${CONTAINER} bash "${f}" | grep -q "No projects defined"; then
+		if ! docker exec -t ${CONTAINER} bash "${f}"; then
 			sleep 5
-			if ! docker exec -t ${CONTAINER} bash "${f}" | grep -q "No projects defined"; then
+			if ! docker exec -t ${CONTAINER} bash "${f}"; then
 				sleep 5
-				if ! docker exec -t ${CONTAINER} bash "${f}" | grep -q "No projects defined"; then
+				if ! docker exec -t ${CONTAINER} bash "${f}"; then
 					sleep 5
-					if ! docker exec -t ${CONTAINER} bash "${f}" | grep -q "No projects defined"; then
-						docker exec -t ${CONTAINER} bash "${f}" || true
+					if ! docker exec -t ${CONTAINER} bash "${f}"; then
 						echo "[FAIl] ${f}"
 						exit 1
 					fi
@@ -34,4 +33,6 @@ cd "${COMPOSEPATH}" && docker-compose exec -T php bash -c "find /startup.2.d/*.s
 		fi
 	fi
 	echo "[OK]   ${f}"
+	echo
+	echo
 done