Disable REMOVE_OLD_MODS when it interferes with managed mod/plugin fe…

…atures (#2648)
itzg · Feb 9, 2024 · 6aaed2d · 6aaed2d
1 parent 15c2e21
commit 6aaed2d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 0 deletions.
diff --git a/scripts/start-deployAutoCF b/scripts/start-deployAutoCF
@@ -24,6 +24,8 @@ resultsFile=/data/.install-curseforge.env
 
 isDebugging && set -x
 
+ensureRemoveAllModsOff "MOD_PLATFORM=AUTO_CURSEFORGE"
+
 args=(
  --results-file="$resultsFile"
 )

diff --git a/scripts/start-deployModrinth b/scripts/start-deployModrinth
@@ -19,6 +19,8 @@ fi
 
 isDebugging && set -x
 
+ensureRemoveAllModsOff "MOD_PLATFORM=MODRINTH"
+
 args=(
  --results-file="$resultsFile"
  --project="${MODRINTH_MODPACK}"

diff --git a/scripts/start-setupModpack b/scripts/start-setupModpack
@@ -83,6 +83,9 @@ fi
 function handleListings() {
  if usesMods && usesPlugins; then
  if [[ "$MODS" ]]; then
+
+ ensureRemoveAllModsOff "MODS is set"
+
  mkdir -p "$MODS_OUT_DIR"
  mc-image-helper mcopy \
  --glob=*.jar \
@@ -91,6 +94,7 @@ function handleListings() {
  "$MODS"
  fi
  if [[ "$PLUGINS" ]]; then
+ ensureRemoveAllModsOff "PLUGINS is set"
  mkdir -p "$PLUGINS_OUT_DIR"
  mc-image-helper mcopy \
  --glob=*.jar \
@@ -100,6 +104,7 @@ function handleListings() {
  fi
 
  if [[ "$MODS_FILE" ]]; then
+ ensureRemoveAllModsOff "MODS_FILE is set"
  mkdir -p "$MODS_OUT_DIR"
  mc-image-helper mcopy \
  --file-is-listing \
@@ -108,6 +113,7 @@ function handleListings() {
  "$MODS_FILE"
  fi
  if [[ "$PLUGINS_FILE" ]]; then
+ ensureRemoveAllModsOff "PLUGINS_FILE is set"
  mkdir -p "$PLUGINS_OUT_DIR"
  mc-image-helper mcopy \
  --file-is-listing \
@@ -123,6 +129,7 @@ function handleListings() {
  fi
 
  if [[ "$MODS" || "$PLUGINS" ]]; then
+ ensureRemoveAllModsOff "MODS or PLUGINS is set"
  mkdir -p "$outDir"
  mc-image-helper mcopy \
  --glob=*.jar \
@@ -132,6 +139,7 @@ function handleListings() {
  fi
 
  if [[ "$MODS_FILE" || "$PLUGINS_FILE" ]]; then
+ ensureRemoveAllModsOff "MODS_FILE or PLUGINS_FILE is set"
  mkdir -p "$outDir"
  mc-image-helper mcopy \
  --file-is-listing \

diff --git a/scripts/start-utils b/scripts/start-utils
@@ -347,4 +347,13 @@ function resolveFamily() {
  ;;
  esac
  export FAMILY
+}
+
+function ensureRemoveAllModsOff() {
+ reason=${1?}
+
+ if isTrue "${REMOVE_OLD_MODS:-false}"; then
+ log "WARNING using REMOVE_OLDS_MODS interferes with $reason -- it is now disabled"
+ REMOVE_OLD_MODS=false
+ fi
 }