Oracle GoldenGate

 - Clean up script execution logic

Signed-off-by: Stephen Balousek <[email protected]>

Author: sbalousek

OracleGoldenGate/23/bin/deployment-main.sh

@@ -126,48 +126,22 @@ function setup_deployment_directories() {
 
 ##
 ##  r u n _ u s e r _ s c r i p t s
-##
-## Hook for launching custom scripts in the container before and after ogg start
-##     Default Values:
-##       - ${OGG_DEPLOYMENT_SCRIPTS}          : "${OGG_HOME}/scripts"
-##
-## Scripts are run lexicographically and recursively from the directories pointed to by:
-##      - ${OGG_DEPLOYMENT_SCRIPTS}/setup are executed prior to any other steps in the boot sequence
-##      - ${OGG_DEPLOYMENT_SCRIPTS}/startup are executed after ogg/nginx startup
+##  Run custom scripts in the container before and after GoldenGate starts
 ##
 function run_user_scripts {
-
-    local SCRIPTS_ROOT="${1}";
-
-    [ -z "$SCRIPTS_ROOT" ] && {
-        printf "%s: No SCRIPTS_ROOT passed on, no scripts will be run\n" "${0}";
-        return 1;
-    } || {
-        if [ -d "$SCRIPTS_ROOT" ] && [ -n "$(ls -A "$SCRIPTS_ROOT")" ]; then
-            printf "Executing user defined scripts in: %s\n" "${SCRIPTS_ROOT}"
-
-            for f in "${SCRIPTS_ROOT}"/*; do
-                [ -d "${f}" ] && {
-                    run_user_scripts "${f}"
-                } || {
-                    case "$f" in
-                        *.sh)
-                                printf "%s: running %s\n" "${0}" "${f}";
-                                source "$f" && state=$? || state=$?
-                                ;;
-                        *)
-                                printf "%s: ignoring %s\n" "${0}" "${f}" && state=$? || state=$?
-                                ;;
-                    esac
-                    echo "";
-                }
-            done
-            echo "DONE: Executing user defined scripts"
-            echo "";
-        fi
-    }
-
-    return 0
+    local scripts="${1}";
+    while read -r script; do
+        case "${script}" in
+            *.sh)
+                echo "Running script '${script}'"
+                # shellcheck disable=SC1090
+                source "${script}"
+                ;;
+            *)
+                echo "Ignoring '${script}'"
+                ;;
+        esac
+    done < <(find "${scripts}" -type f | sort)
 }
 
 ##
@@ -218,8 +192,8 @@ function signal_handling() {
 ##
 ##  Entrypoint
 ##
-run_user_scripts "${OGG_DEPLOYMENT_SCRIPTS}/setup"
 generatePassword
+run_user_scripts "${OGG_DEPLOYMENT_SCRIPTS}/setup"
 setup_deployment_directories
 locate_java
 locate_lib_jvm