From 5940cc7169a04e56cf381839dee8f59b07175d96 Mon Sep 17 00:00:00 2001
From: alex-phillips <ahp118@gmail.com>
Date: Mon, 20 May 2019 12:43:06 -0400
Subject: [PATCH] modified logic to have init script and services folder checks
 in single check

---
 root/etc/cont-init.d/99-custom-scripts | 72 +++++++++++++-------------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/root/etc/cont-init.d/99-custom-scripts b/root/etc/cont-init.d/99-custom-scripts
index aff7240..cfde313 100644
--- a/root/etc/cont-init.d/99-custom-scripts
+++ b/root/etc/cont-init.d/99-custom-scripts
@@ -4,24 +4,6 @@
 SCRIPTS_DIR="/config/custom-cont-init.d"
 SERVICES_DIR="/config/custom-services.d"
 
-# Make sure custom init directory exists and has files in it
-if ([ -e "${SCRIPTS_DIR}" ] && \
-   [ -n "$(/bin/ls -A ${SCRIPTS_DIR} 2>/dev/null)" ]); then
-    echo "[custom-init] files found in ${SCRIPTS_DIR} executing"
-    for SCRIPT in ${SCRIPTS_DIR}/*; do
-      NAME="$(basename "${SCRIPT}")"
-      if [ -f "${SCRIPT}" ]; then
-        echo "[custom-init] ${NAME}: executing..."
-        /bin/bash ${SCRIPT}
-        echo "[custom-init] ${NAME}: exited $?"
-      elif [ ! -f "${SCRIPT}" ]; then
-        echo "[custom-init] ${NAME}: is not a file"
-      fi
-    done
-else
-    echo "[custom-init] no custom init files found"
-fi
-
 # Remove all existing custom services before continuing to ensure
 # we aren't running anything the user may have removed
 if [ -n "$(/bin/ls -A /etc/services.d/custom-service-* 2>/dev/null)" ]; then
@@ -29,24 +11,40 @@ if [ -n "$(/bin/ls -A /etc/services.d/custom-service-* 2>/dev/null)" ]; then
   rm -rf /etc/services.d/custom-service-*
 fi
 
-# Make sure custom services directory exists and has files in it
-if [ -e "${SERVICES_DIR}" ] && \
-   [ -n "$(/bin/ls -A ${SERVICES_DIR} 2>/dev/null)" ]; then
-    echo "[custom-init] service files found in ${SERVICES_DIR}"
-    for SERVICE in ${SERVICES_DIR}/*; do
-      NAME="$(basename "${SERVICE}")"
-      if [ -f "${SERVICE}" ]; then
-        echo "[custom-init] ${NAME}: service detected, copying..."
-        mkdir -p /etc/services.d/custom-service-${NAME}/
-        cp ${SERVICE} /etc/services.d/custom-service-${NAME}/run
-        chmod +x /etc/services.d/custom-service-${NAME}/run
-        echo "[custom-init] ${NAME}: copied"
-      elif [ ! -f "${SERVICE}" ]; then
-        echo "[custom-init] ${NAME}: is not a file"
-      fi
-    done
+# Make sure custom init directory exists and has files in it
+if ([ -e "${SCRIPTS_DIR}" ] && \
+   [ -n "$(/bin/ls -A ${SCRIPTS_DIR} 2>/dev/null)" ]) || \
+   ([ -e "${SERVICES_DIR}" ] && \
+   [ -n "$(/bin/ls -A ${SERVICES_DIR} 2>/dev/null)" ]); then
+    if [ -n "$(/bin/ls -A ${SCRIPTS_DIR} 2>/dev/null)" ]; then
+      echo "[custom-init] files found in ${SCRIPTS_DIR} executing"
+      for SCRIPT in ${SCRIPTS_DIR}/*; do
+        NAME="$(basename "${SCRIPT}")"
+        if [ -f "${SCRIPT}" ]; then
+          echo "[custom-init] ${NAME}: executing..."
+          /bin/bash ${SCRIPT}
+          echo "[custom-init] ${NAME}: exited $?"
+        elif [ ! -f "${SCRIPT}" ]; then
+          echo "[custom-init] ${NAME}: is not a file"
+        fi
+      done
+    fi
+    if [ -n "$(/bin/ls -A ${SERVICES_DIR} 2>/dev/null)" ]; then
+      echo "[custom-init] service files found in ${SERVICES_DIR}"
+      for SERVICE in ${SERVICES_DIR}/*; do
+        NAME="$(basename "${SERVICE}")"
+        if [ -f "${SERVICE}" ]; then
+          echo "[custom-init] ${NAME}: service detected, copying..."
+          mkdir -p /etc/services.d/custom-service-${NAME}/
+          cp ${SERVICE} /etc/services.d/custom-service-${NAME}/run
+          chmod +x /etc/services.d/custom-service-${NAME}/run
+          echo "[custom-init] ${NAME}: copied"
+        elif [ ! -f "${SERVICE}" ]; then
+          echo "[custom-init] ${NAME}: is not a file"
+        fi
+      done
+    fi
+  fi
 else
-    echo "[custom-init] no custom services files found"
+  echo "[custom-init] no custom files found exiting..."
 fi
-
-echo "[custom-init] done"