Fix copying output (#980)

OXID-eSales · Jul 2, 2024 · c25b8c8 · c25b8c8
1 parent 88826f9
commit c25b8c8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/.github/oxid-esales/install.sh b/.github/oxid-esales/install.sh
@@ -38,7 +38,7 @@ function init() {
     else
       echo "OXID_BUILD_DIRECTORY is set to '${OXID_BUILD_DIRECTORY}'"
     fi
-    if [ ! -d "${OXID_BUILD_DIRECTORY}" ]; then
+    if [ ! -d "${OXID_BUILD_DIRECTORY/\/var\/www/source}" ]; then
       echo "Creating '${OXID_BUILD_DIRECTORY}'"
       docker compose "${install_container_method}" -T \
         ${install_container_options} \

diff --git a/tests/scripts/codeception.sh b/tests/scripts/codeception.sh
@@ -39,9 +39,7 @@ echo "Codecept build exited with error code ${RESULT}"
 RESULT=$?
 echo "Codecept run exited with error code ${RESULT}"
 [[ ! -d tests/Output ]] && mkdir tests/Output
-if [ -n "$(find tests/Codeception/_output -type f)" ]; then
-    cp tests/Codeception/_output/* tests/Output
-fi
+find tests/Codeception/_output -type f -exec cp \{\} tests/Output/ \;
 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

diff --git a/tests/scripts/shop-setup.sh b/tests/scripts/shop-setup.sh
@@ -54,9 +54,7 @@ echo "codecept build exited with error code ${RESULT}"
 RESULT=$?
 echo "codecept run exited with error code ${RESULT}"
 [[ ! -d tests/Output ]] && mkdir tests/Output
-if [ -n "$(find tests/Codeception/_output -type f)" ]; then
-    cp tests/Codeception/_output/* tests/Output
-fi
+find tests/Codeception/_output -type f -exec cp \{\} tests/Output/ \;
 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