From 68c6a33c9df415b033f89b3d0593b3a090bcfccf Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Fri, 2 Sep 2022 10:37:10 +0100
Subject: [PATCH] Remove circular dep

---
 root/docker-mods | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/root/docker-mods b/root/docker-mods
index 4f4567c..32e9382 100755
--- a/root/docker-mods
+++ b/root/docker-mods
@@ -22,7 +22,6 @@ fi
 if [[ -z "$(/bin/ls -A ${SERVICES_DIR} 2>/dev/null)" ]] &&
     [[ -z "$(/bin/ls -A ${SERVICES_DIR_OLD} 2>/dev/null)" ]]; then
     echo "[custom-init] no custom services found, skipping..."
-    return
 fi
 
 # Make sure custom service directory exists and has files in it
@@ -32,12 +31,11 @@ if [[ -e "${SERVICES_DIR}" ]] && [[ -n "$(/bin/ls -A ${SERVICES_DIR} 2>/dev/null
         NAME="$(basename "${SERVICE}")"
         if [[ -f "${SERVICE}" ]]; then
             echo "[custom-init] ${NAME}: service detected, copying..."
-            mkdir -p /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/dependencies.d
+            mkdir -p /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/dependencies.d/
             cp "${SERVICE}" /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/run
             chmod +x /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/run
             echo "longrun" >/etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/type
             touch /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/dependencies.d/init-services
-            touch /etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/custom-svc-"${NAME}"
             echo "[custom-init] ${NAME}: copied"
         elif [[ ! -f "${SERVICE}" ]]; then
             echo "[custom-init] ${NAME}: is not a file"
@@ -51,12 +49,11 @@ if [[ -e "${SERVICES_DIR_OLD}" ]] && [[ -n "$(/bin/ls -A ${SERVICES_DIR_OLD} 2>/
         NAME="$(basename "${SERVICE}")"
         if [[ -f "${SERVICE}" ]]; then
             echo "[custom-init] ${NAME}: service detected, copying..."
-            mkdir -p /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/dependencies.d
+            mkdir -p /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/dependencies.d/
             cp "${SERVICE}" /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/run
             chmod +x /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/run
             echo "longrun" >/etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/type
             touch /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/dependencies.d/init-services
-            touch /etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/custom-svc-"${NAME}"
             echo "[custom-init] ${NAME}: copied"
         elif [[ ! -f "${SERVICE}" ]]; then
             echo "[custom-init] ${NAME}: is not a file"