From 2f129611ccaa33454169747d6b0d6c3f33f4b386 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Fri, 22 Nov 2019 09:14:33 +0100
Subject: [PATCH] Fix unbound variable in tests

---
 .github/workflows/ci-smoke-php-httpd.yml        | 11 -----------
 .github/workflows/ci-smoke-versions.yml         | 11 -----------
 .tests/Makefile                                 |  4 ++++
 .tests/tests/autostart-examples.sh              |  2 +-
 .tests/tests/intranet-email.sh                  |  2 +-
 .tests/tests/intranet-homepage.sh               |  2 +-
 .tests/tests/intranet-memcached.sh              |  2 +-
 .tests/tests/intranet-redis.sh                  |  2 +-
 .tests/tests/intranet-vhost.sh                  |  2 +-
 .tests/tests/modules-curl-vhosts.sh             |  2 +-
 .tests/tests/modules-php-vhosts.sh              |  2 +-
 .tests/tests/rproxy-javascript.sh               |  2 +-
 .tests/tests/ssl-intranet.sh                    |  2 +-
 .tests/tests/ssl-vhost.sh                       |  2 +-
 .tests/tests/vendor-adminer-mongo.sh            |  2 +-
 .tests/tests/vendor-adminer-mysql.sh            |  2 +-
 .tests/tests/vendor-adminer-pgsql.sh            |  2 +-
 .tests/tests/vhost-directory_index.sh           |  2 +-
 .tests/tests/vhost-vhostgen_customize.sh        |  2 +-
 .tests/tests/vhost-vhostgen_default_template.sh |  2 +-
 20 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/ci-smoke-php-httpd.yml b/.github/workflows/ci-smoke-php-httpd.yml
index f02f3297..fdad7fda 100644
--- a/.github/workflows/ci-smoke-php-httpd.yml
+++ b/.github/workflows/ci-smoke-php-httpd.yml
@@ -87,17 +87,6 @@ jobs:
           # Set the two candidates to test against
           make configure KEY=PHP_SERVER   VAL=${PHP}
           make configure KEY=HTTPD_SERVER VAL=${HTTPD}
-
-          # Set projects directory
-          make configure KEY=HOST_PATH_HTTPD_DATADIR VAL=.tests/www
-
-          # Set uid/gid
-          make configure KEY=NEW_UID VAL=$(id -u)
-          make configure KEY=NEW_GID VAL=$(id -g)
-
-          # Make it more verbose
-          make configure KEY=DEBUG_COMPOSE_ENTRYPOINT VAL=2
-
           # 3306 is taken, so chose another one
           make configure KEY=HOST_PORT_MYSQL VAL=3307
 
diff --git a/.github/workflows/ci-smoke-versions.yml b/.github/workflows/ci-smoke-versions.yml
index 719a4716..0f14248a 100644
--- a/.github/workflows/ci-smoke-versions.yml
+++ b/.github/workflows/ci-smoke-versions.yml
@@ -141,17 +141,6 @@ jobs:
           cd .tests/
           # Set the matrix version
           make configure KEY="${VERSION//=*/}" VAL="${VERSION//*=}"
-
-          # Set projects directory
-          make configure KEY=HOST_PATH_HTTPD_DATADIR VAL=.tests/www
-
-          # Set uid/gid
-          make configure KEY=NEW_UID VAL=$(id -u)
-          make configure KEY=NEW_GID VAL=$(id -g)
-
-          # Make it more verbose
-          make configure KEY=DEBUG_COMPOSE_ENTRYPOINT VAL=2
-
           # 3306 is taken, so chose another one
           make configure KEY=HOST_PORT_MYSQL VAL=3307
         env:
diff --git a/.tests/Makefile b/.tests/Makefile
index 6d9ea564..7fd04e38 100644
--- a/.tests/Makefile
+++ b/.tests/Makefile
@@ -52,6 +52,10 @@ pull: ../.env
 ### Startup Devilbox
 ###
 start: ../.env
+	@$(MAKE) --no-print-directory configure KEY=HOST_PATH_HTTPD_DATADIR VAL=.tests/www
+	@$(MAKE) --no-print-directory configure KEY=DEBUG_COMPOSE_ENTRYPOINT VAL=2
+	@$(MAKE) --no-print-directory configure KEY=NEW_UID VAL=$$(id -u)
+	@$(MAKE) --no-print-directory configure KEY=NEW_GID VAL=$$(id -g)
 	@$(PWD)/scripts/compose-start.sh
 
 
diff --git a/.tests/tests/autostart-examples.sh b/.tests/tests/autostart-examples.sh
index ccad5d26..bee76166 100755
--- a/.tests/tests/autostart-examples.sh
+++ b/.tests/tests/autostart-examples.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo
diff --git a/.tests/tests/intranet-email.sh b/.tests/tests/intranet-email.sh
index c740ed7c..f04ab6b0 100755
--- a/.tests/tests/intranet-email.sh
+++ b/.tests/tests/intranet-email.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo
diff --git a/.tests/tests/intranet-homepage.sh b/.tests/tests/intranet-homepage.sh
index a6752f1e..e2b48c55 100755
--- a/.tests/tests/intranet-homepage.sh
+++ b/.tests/tests/intranet-homepage.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo
diff --git a/.tests/tests/intranet-memcached.sh b/.tests/tests/intranet-memcached.sh
index ff02370c..a9bdb8b5 100755
--- a/.tests/tests/intranet-memcached.sh
+++ b/.tests/tests/intranet-memcached.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo
diff --git a/.tests/tests/intranet-redis.sh b/.tests/tests/intranet-redis.sh
index 945a46e0..fcb118b7 100755
--- a/.tests/tests/intranet-redis.sh
+++ b/.tests/tests/intranet-redis.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo
diff --git a/.tests/tests/intranet-vhost.sh b/.tests/tests/intranet-vhost.sh
index a4e11f55..41b15fc8 100755
--- a/.tests/tests/intranet-vhost.sh
+++ b/.tests/tests/intranet-vhost.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo
diff --git a/.tests/tests/modules-curl-vhosts.sh b/.tests/tests/modules-curl-vhosts.sh
index 681f29f7..4260fcd8 100755
--- a/.tests/tests/modules-curl-vhosts.sh
+++ b/.tests/tests/modules-curl-vhosts.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo
diff --git a/.tests/tests/modules-php-vhosts.sh b/.tests/tests/modules-php-vhosts.sh
index 84c121ec..8642faae 100755
--- a/.tests/tests/modules-php-vhosts.sh
+++ b/.tests/tests/modules-php-vhosts.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo
diff --git a/.tests/tests/rproxy-javascript.sh b/.tests/tests/rproxy-javascript.sh
index 74f8709d..d2a6c993 100755
--- a/.tests/tests/rproxy-javascript.sh
+++ b/.tests/tests/rproxy-javascript.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo
diff --git a/.tests/tests/ssl-intranet.sh b/.tests/tests/ssl-intranet.sh
index 2e9aca09..b843750e 100755
--- a/.tests/tests/ssl-intranet.sh
+++ b/.tests/tests/ssl-intranet.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo
diff --git a/.tests/tests/ssl-vhost.sh b/.tests/tests/ssl-vhost.sh
index 12330781..6dda5d41 100755
--- a/.tests/tests/ssl-vhost.sh
+++ b/.tests/tests/ssl-vhost.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo
diff --git a/.tests/tests/vendor-adminer-mongo.sh b/.tests/tests/vendor-adminer-mongo.sh
index 44ea01ec..9a1e2a7f 100755
--- a/.tests/tests/vendor-adminer-mongo.sh
+++ b/.tests/tests/vendor-adminer-mongo.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo
diff --git a/.tests/tests/vendor-adminer-mysql.sh b/.tests/tests/vendor-adminer-mysql.sh
index ea7eda48..1b576d5e 100755
--- a/.tests/tests/vendor-adminer-mysql.sh
+++ b/.tests/tests/vendor-adminer-mysql.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo
diff --git a/.tests/tests/vendor-adminer-pgsql.sh b/.tests/tests/vendor-adminer-pgsql.sh
index 1909527c..5ed9c6c9 100755
--- a/.tests/tests/vendor-adminer-pgsql.sh
+++ b/.tests/tests/vendor-adminer-pgsql.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo
diff --git a/.tests/tests/vhost-directory_index.sh b/.tests/tests/vhost-directory_index.sh
index 0485e66e..4d408911 100755
--- a/.tests/tests/vhost-directory_index.sh
+++ b/.tests/tests/vhost-directory_index.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo
diff --git a/.tests/tests/vhost-vhostgen_customize.sh b/.tests/tests/vhost-vhostgen_customize.sh
index 323ba23a..aa55f1a9 100755
--- a/.tests/tests/vhost-vhostgen_customize.sh
+++ b/.tests/tests/vhost-vhostgen_customize.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo
diff --git a/.tests/tests/vhost-vhostgen_default_template.sh b/.tests/tests/vhost-vhostgen_default_template.sh
index caa12a48..69bd8b89 100755
--- a/.tests/tests/vhost-vhostgen_default_template.sh
+++ b/.tests/tests/vhost-vhostgen_default_template.sh
@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=()
+DISABLED_VERSIONS=("")
 
 
 echo