From eeeb4edc24e3c04707a518e49542f10dffac183f Mon Sep 17 00:00:00 2001
From: Josh <josh.t.richards@gmail.com>
Date: Tue, 26 Nov 2024 08:40:09 -0500
Subject: [PATCH 1/2] fix(hooks): Consistent logging + skip when empty too

- Use "Searching for scripts [...] located in [...]" consistently (i.e. for each hook_folder_path instead of only for some / under some conditions)
- Skip early if a given hook folder is empty too (not just nonexistent)
- Add feature name (hooks) to all messaging for clarity

Signed-off-by: Josh <josh.t.richards@gmail.com>
---
 docker-entrypoint.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 8e178f2ec..5c880189d 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -24,30 +24,30 @@ run_path() {
     local hook_folder_path="/docker-entrypoint-hooks.d/$1"
     local return_code=0
 
-    if ! [ -d "${hook_folder_path}" ]; then
-        echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
+    echo "=> Searching for hook scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
+
+    if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
+        echo "=> Skipping the hook folder \"${hook_folder_path}\", because it doesn't exist or is empty"
         return 0
     fi
 
-    echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
-
     (
         find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -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"
+                echo "==> The hook script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
                 continue
             fi
 
-            echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
+            echo "==> Running the hook script (cwd: $(pwd)): \"${script_file_path}\""
 
             run_as "${script_file_path}" || return_code="$?"
 
             if [ "${return_code}" -ne "0" ]; then
-                echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
+                echo "==> Failed at executing hook script \"${script_file_path}\". Exit code: ${return_code}"
                 exit 1
             fi
 
-            echo "==> Finished the script: \"${script_file_path}\""
+            echo "==> Finished the hook script: \"${script_file_path}\""
         done
     )
 }

From f360440588971a52aa62ff38a4b01f45ae5f4cfa Mon Sep 17 00:00:00 2001
From: Josh <josh.t.richards@gmail.com>
Date: Tue, 26 Nov 2024 12:00:46 -0500
Subject: [PATCH 2/2] fix(hooks): Clear state delineation / consistent output

Signed-off-by: Josh <josh.t.richards@gmail.com>
---
 docker-entrypoint.sh | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 5c880189d..db6044a8b 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -23,32 +23,39 @@ run_as() {
 run_path() {
     local hook_folder_path="/docker-entrypoint-hooks.d/$1"
     local return_code=0
+    local found=0
 
-    echo "=> Searching for hook scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
+    echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""
 
     if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
-        echo "=> Skipping the hook folder \"${hook_folder_path}\", because it doesn't exist or is empty"
+        echo "==> Skipped: the \"$1\" folder is empty (or does not exist)"
         return 0
     fi
 
-    (
-        find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
+    find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | (
+        while read -r script_file_path; do
             if ! [ -x "${script_file_path}" ]; then
-                echo "==> The hook script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
+                echo "==> The script \"${script_file_path}\" was skipped, because it lacks the executable flag"
+                found=$((found-1))
                 continue
             fi
 
-            echo "==> Running the hook script (cwd: $(pwd)): \"${script_file_path}\""
-
+            echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
+            found=$((found+1))
             run_as "${script_file_path}" || return_code="$?"
 
             if [ "${return_code}" -ne "0" ]; then
-                echo "==> Failed at executing hook script \"${script_file_path}\". Exit code: ${return_code}"
+                echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
                 exit 1
             fi
 
-            echo "==> Finished the hook script: \"${script_file_path}\""
+            echo "==> Finished executing the script: \"${script_file_path}\""
         done
+        if [ "$found" -lt "1" ]; then
+            echo "==> Skipped: the \"$1\" folder does not contain any valid scripts"
+        else
+            echo "=> Completed executing scripts in the \"$1\" folder"
+        fi
     )
 }