From b5f9bf10939d1711942a857f77b4465e20935ac9 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Fri, 15 Jul 2022 21:07:38 +0100
Subject: [PATCH] Handle dual-mode mods

---
 root/docker-mods | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/root/docker-mods b/root/docker-mods
index dcdcc4f..dea7cdd 100755
--- a/root/docker-mods
+++ b/root/docker-mods
@@ -197,7 +197,20 @@ run_mods () {
         --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
+      mv /tmp/mod/* /
+      shopt -u dotglob
+      rm -rf /tmp/mod
       rm -rf /modtarball.tar.xz
       echo ${SHALAYER} > "/${FILENAME}"
     fi