Bug fix: not found error if hook folder contains files but non ending…

… with `*.sh` (#2095) * Use `find` to located `*.sh` Signed-off-by: Dennis Vestergaard Værum <[email protected]> * added msg if hook folder does not exist Signed-off-by: Dennis Vestergaard Værum <[email protected]> * Updated info message Co-authored-by: J0WI <[email protected]> Signed-off-by: Dennis Værum <[email protected]> * Update docker-entrypoint.sh Small adjustments Signed-off-by: Dennis Værum <[email protected]> --------- Signed-off-by: Dennis Vestergaard Værum <[email protected]> Signed-off-by: Dennis Værum <[email protected]> Co-authored-by: J0WI <[email protected]>
nextcloud · Nov 14, 2023 · 23d099b · 23d099b
1 parent 2bfad53
commit 23d099b
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -24,17 +24,17 @@ run_path() {
     local hook_folder_path="/docker-entrypoint-hooks.d/$1"
     local return_code=0
 
-    echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
-
-    if [ -z "$(ls -A "${hook_folder_path}")" ]; then
-      echo "==> but the hook folder \"$(basename "${hook_folder_path}")\" is empty, so nothing to do"
+    if ! [ -d "${hook_folder_path}" ]; then
+        echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
         return 0
     fi
 
+    echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
+
     (
-        for script_file_path in "${hook_folder_path}/"*.sh; do
-            if ! [ -x "${script_file_path}" ] && [ -f "${script_file_path}" ]; then
-                echo "==> The script \"${script_file_path}\" in the folder \"${hook_folder_path}\" was skipping, because it didn't have the executable flag"
+        find "${hook_folder_path}" -type f -maxdepth 1 -iname '*.sh' -print | sort | while read -r script_file_path; do
+            if ! [ -x "${script_file_path}" ]; then
+                echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
                 continue
             fi