Check config generation in install

OXID-eSales · Jun 26, 2024 · 7721d80 · 7721d80
1 parent 33a5a35
commit 7721d80
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/.github/oxid-esales/install.sh b/.github/oxid-esales/install.sh
@@ -62,6 +62,27 @@ docker compose "${install_container_method}" -T \
     --shop-directory /var/www/source \
     --compile-directory "${OXID_BUILD_DIRECTORY}"
 
+if diff -q source/source/config.inc.php.dist source/source/config.inc.php; then
+    echo "source/config.inc.php has not been modified"
+    if diff -q source/vendor/oxid-esales/oxideshop-ce/source/config.inc.php.dist source/vendor/oxid-esales/oxideshop-ce/source/config.inc.php; then
+        echo "vendor/oxid-esales/oxideshop-ce/source/config.inc.php has not been modified"
+        echo "No valid config"
+        exit 1
+    else
+        echo "Config file is vendor/oxid-esales/oxideshop-ce/source/config.inc.php copying to source/config.inc.php"
+        CONFIG_FILE=vendor/oxid-esales/oxideshop-ce/source/config.inc.php
+        cp source/${CONFIG_FILE} source/source/config.inc.php
+    fi
+else
+    echo "Config file is source/config.inc.php"
+    CONFIG_FILE=source/config.inc.php
+    if diff -q source/vendor/oxid-esales/oxideshop-ce/source/config.inc.php.dist source/vendor/oxid-esales/oxideshop-ce/source/config.inc.php; then
+        echo "vendor/oxid-esales/oxideshop-ce/source/config.inc.php has not been modified, copying from source"
+        cp source/${CONFIG_FILE} source/vendor/oxid-esales/oxideshop-ce/source/config.inc.php
+    fi
+
+fi
+
 # Activate iDebug
 if [ "${install_config_idebug}" == 'true' ]; then
     if [ -f source/source/config.inc.php ]; then

diff --git a/tests/scripts/codeception.sh b/tests/scripts/codeception.sh
@@ -11,7 +11,9 @@ vendor/bin/codecept run acceptance \
 RESULT=$?
 echo "Codecept run exited with error code ${RESULT}"
 [[ ! -d tests/Output ]] && mkdir tests/Output
-cp tests/Codeception/_output/* tests/Output
+if [ -n "$(find tests/Codeception/_output -type f)" ]; then
+    cp tests/Codeception/_output/* tests/Output
+fi
 if [ ! -s "tests/Output/codeception_Acceptance.txt" ]; then
     echo -e "\033[0;31mLog file is empty! Seems like no tests have been run!\033[0m"
     RESULT=1

diff --git a/tests/scripts/shop-setup.sh b/tests/scripts/shop-setup.sh
@@ -54,7 +54,9 @@ echo "codecept build exited with error code ${RESULT}"
 RESULT=$?
 echo "codecept run exited with error code ${RESULT}"
 [[ ! -d tests/Output ]] && mkdir tests/Output
-cp tests/Codeception/_output/* tests/Output
+if [ -n "$(find tests/Codeception/_output -type f)" ]; then
+    cp tests/Codeception/_output/* tests/Output
+fi
 if [ ! -s "tests/Output/codeception_${SUITE}.txt" ]; then
     echo -e "\033[0;31mLog file is empty! Seems like no tests have been run!\033[0m"
     RESULT=1