From 2e9be596f767a9d1792399b060e3a52cb6f9c632 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Wed, 12 Jun 2024 16:38:41 -0500
Subject: [PATCH] Fixed issue of unbound REMOVE_OLD_MODS_EXCLUDE variable when
 using SPIGET_RESOURCES (#2891)

---
 .../docker-compose.yml}                                  | 9 +++------
 scripts/start-spiget                                     | 5 ++++-
 scripts/start-utils                                      | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename examples/{docker-compose-spiget.yml => spiget/docker-compose.yml} (71%)

diff --git a/examples/docker-compose-spiget.yml b/examples/spiget/docker-compose.yml
similarity index 71%
rename from examples/docker-compose-spiget.yml
rename to examples/spiget/docker-compose.yml
index 5ea7b7e4..c90e6cf1 100644
--- a/examples/docker-compose-spiget.yml
+++ b/examples/spiget/docker-compose.yml
@@ -1,6 +1,5 @@
 # NOTE
-# This file is named spiget with an "e"
-# since it provides an example of the 
+# This file is purposely named spiget with an "e" since it provides an example of the
 # feature https://docker-minecraft-server.readthedocs.io/en/latest/mods-and-plugins/spiget/
 # which uses the Spiget API at https://spiget.org/
 
@@ -13,8 +12,6 @@ services:
       EULA: "TRUE"
       TYPE: PAPER
       SPIGET_RESOURCES: 34315,3836
+      REMOVE_OLD_MODS: true
     volumes:
-      - data:/data
-
-volumes:
-  data: {}
+      - ./data:/data
diff --git a/scripts/start-spiget b/scripts/start-spiget
index 9e720e39..b64e7773 100755
--- a/scripts/start-spiget
+++ b/scripts/start-spiget
@@ -8,7 +8,10 @@ handleDebugMode
 
 : "${SPIGET_RESOURCES:=}"
 : "${SPIGET_DOWNLOAD_TOLERANCE:=5}" # in minutes
+: "${REMOVE_OLD_MODS:=false}"
+: "${REMOVE_OLD_MODS_EXCLUDE:=}"
 : "${REMOVE_OLD_MODS_INCLUDE:=*.jar,*-version.json}"
+: "${REMOVE_OLD_MODS_DEPTH:=1} "
 
 acceptArgs=(--accept application/zip --accept application/java-archive --accept application/octet-stream)
 
@@ -127,7 +130,7 @@ downloadResourceFromSpiget() {
 }
 
 if [[ ${SPIGET_RESOURCES} ]]; then
-  if isTrue "${REMOVE_OLD_MODS:-false}"; then
+  if isTrue "${REMOVE_OLD_MODS}"; then
     removeOldMods /data/plugins
     REMOVE_OLD_MODS=false
   fi
diff --git a/scripts/start-utils b/scripts/start-utils
index 7484c386..d64f1c1f 100755
--- a/scripts/start-utils
+++ b/scripts/start-utils
@@ -207,13 +207,13 @@ eula=${EULA,,}
 
 function removeOldMods {
   if [ -d "$1" ]; then
-    log "Removing old mods including:${REMOVE_OLD_MODS_INCLUDE} excluding:${REMOVE_OLD_MODS_EXCLUDE}"
+    log "Removing old mods including='${REMOVE_OLD_MODS_INCLUDE}' excluding='${REMOVE_OLD_MODS_EXCLUDE}' up to depth=${REMOVE_OLD_MODS_DEPTH}"
     args=(
       --delete
       --type file
-      --min-depth=1 --max-depth "${REMOVE_OLD_MODS_DEPTH:-16}"
-      --name "${REMOVE_OLD_MODS_INCLUDE:-*}"
-      --exclude-name "${REMOVE_OLD_MODS_EXCLUDE:-}"
+      --min-depth=1 --max-depth "${REMOVE_OLD_MODS_DEPTH}"
+      --name "${REMOVE_OLD_MODS_INCLUDE}"
+      --exclude-name "${REMOVE_OLD_MODS_EXCLUDE}"
     )
     if ! isDebugging; then
       args+=(--quiet)