fix: ensured GENERIC_PACKS are re-applied with REMOVE_OLD_MODS (#1257)

#1253
This commit is contained in:
Geoff Bourne
2022-01-05 21:38:51 -06:00
committed by GitHub
parent 4c7bb313be
commit 79f978359c
2 changed files with 3 additions and 1 deletions

View File

@@ -6,6 +6,7 @@ set -e -o pipefail
: "${MODS_FILE:=}"
: "${REMOVE_OLD_MODS_DEPTH:=1} "
: "${REMOVE_OLD_MODS_INCLUDE:=*.jar}"
sum_file=/data/.generic_pack.sum
# shellcheck source=start-utils
. "${SCRIPTS:-/}start-utils"
@@ -18,6 +19,7 @@ CURSE_URL_BASE=${CURSE_URL_BASE:-https://minecraft.curseforge.com/projects}
if isTrue "${REMOVE_OLD_MODS}" && [ -z "${MODS_FILE}" ]; then
removeOldMods /data/mods
removeOldMods /data/plugins
rm -f "$sum_file"
fi
# If packwiz url passed, bootstrap packwiz and update mods before other modpack processing
@@ -204,7 +206,6 @@ if [[ "${GENERIC_PACKS}" ]]; then
fi
done
sum_file=/data/.generic_pack.sum
isDebugging && [ -f "$sum_file}" ] && cat "$sum_file"
if ! sha256sum -c "${sum_file}" --status 2> /dev/null; then
base_dir=/tmp/generic_pack_base