From bc572bd5234b0252c461dd589b5191ae9d169b3f Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Thu, 1 Dec 2022 07:52:14 -0600 Subject: [PATCH] Let FTB installer manage file removal during version change (#1851) --- scripts/start-deployFTBA | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/start-deployFTBA b/scripts/start-deployFTBA index ef001608..c9d7adab 100755 --- a/scripts/start-deployFTBA +++ b/scripts/start-deployFTBA @@ -46,10 +46,9 @@ if ! [ -f "${ftbInstallMarker}" ] || [ "$(cat "${ftbInstallMarker}")" != "${FTB_ chmod +x "${ftbInstaller}" fi - rm -rf forge*jar mods config libraries defaultconfigs changelogs - log "Installing modpack ID ${FTB_MODPACK_ID}, version ID ${FTB_MODPACK_VERSION_ID}" - ${ftbInstaller} ${FTB_MODPACK_ID} ${FTB_MODPACK_VERSION_ID} --noscript --auto + log "This could take a while..." + ${ftbInstaller} "${FTB_MODPACK_ID}" "${FTB_MODPACK_VERSION_ID}" --noscript --auto > ftb-installer.log rm -f forge*installer.jar echo "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" > ${ftbInstallMarker} @@ -62,7 +61,6 @@ else log "FTB modpack ID ${FTB_MODPACK_ID}, version ID ${FTB_MODPACK_VERSION_ID} is ready to go" fi -isDebugging && cat version.json forgeVersion=$(jq -r '.targets|unique[] | select(.name == "forge") | .version' version.json) fabricVersion=$(jq -r '.targets|unique[] | select(.name == "fabric") | .version' version.json) mcVersion=$(jq -r '.targets|unique[] | select(.name == "minecraft") | .version' version.json)