From 303d9e527a723b651b93f352fa15c52db0b0d396 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Fri, 22 Jul 2022 15:49:00 +0100
Subject: [PATCH 1/2] Support hybrid mods

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

diff --git a/root/docker-mods b/root/docker-mods
index 732f167..5c7d4fd 100755
--- a/root/docker-mods
+++ b/root/docker-mods
@@ -116,16 +116,30 @@ for DOCKER_MOD in "${DOCKER_MODS[@]}"; do
     echo "[mod-init] ${DOCKER_MOD} at ${SHALAYER} has been previously applied skipping"
   else
     # Download and extract layer to /
-    curl -f --retry 10 --retry-max-time 60 --retry-all-errors \
+    curl -f --retry 10 --retry-max-time 60 --retry-connrefused \
       --silent \
       --location \
       --request GET \
       --header "Authorization: Bearer ${TOKEN}" \
       "${BLOB_URL}${SHALAYER}" -o \
       /modtarball.tar.xz
-    tar xzf /modtarball.tar.xz -C /
+    mkdir -p /tmp/mod
+    tar xzf /modtarball.tar.xz -C /tmp/mod
+    if [ -d /tmp/mod/etc/s6-overlay ]; then
+      if [ -d /tmp/mod/etc/cont-init.d ]; then
+        rm -rf /tmp/mod/etc/cont-init.d
+      fi
+      if [ -d /tmp/mod/etc/services.d ]; then
+        rm -rf /tmp/mod/etc/services.d
+      fi
+    fi
+    shopt -s dotglob
+    cp -R /tmp/mod/* /
+    shopt -u dotglob
+    rm -rf /tmp/mod
     rm -rf /modtarball.tar.xz
     echo ${SHALAYER} > "/${FILENAME}"
+    echo "[mod-init] ${DOCKER_MOD} applied to container"
   fi
 done
 

From ae04d9f8532acc09bf31d853d589ba1f6eb5126a Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Fri, 22 Jul 2022 15:56:21 +0100
Subject: [PATCH 2/2] Fix curl retry

---
 root/docker-mods | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root/docker-mods b/root/docker-mods
index 5c7d4fd..ead588e 100755
--- a/root/docker-mods
+++ b/root/docker-mods
@@ -116,7 +116,7 @@ for DOCKER_MOD in "${DOCKER_MODS[@]}"; do
     echo "[mod-init] ${DOCKER_MOD} at ${SHALAYER} has been previously applied skipping"
   else
     # Download and extract layer to /
-    curl -f --retry 10 --retry-max-time 60 --retry-connrefused \
+    curl -f --retry 10 --retry-max-time 60 --retry-all-errors \
       --silent \
       --location \
       --request GET \