From c8cc882a5792ea22f3bf3c384d4e339d2dfec635 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 13 Jul 2018 22:33:55 -0500 Subject: [PATCH] mc: support the Install.sh step of CurseForge modpacks within TYPE=FTB fixes #180 --- minecraft-server/start | 1 - minecraft-server/start-deployFTB | 13 ++++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/minecraft-server/start b/minecraft-server/start index 1df4f3eb..9610797f 100755 --- a/minecraft-server/start +++ b/minecraft-server/start @@ -39,7 +39,6 @@ if [[ $PROXY ]]; then fi export SERVER_PROPERTIES=/data/server.properties -export FTB_DIR=/data/FeedTheBeast export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json echo "Checking version information." diff --git a/minecraft-server/start-deployFTB b/minecraft-server/start-deployFTB index c4609c93..33cda449 100755 --- a/minecraft-server/start-deployFTB +++ b/minecraft-server/start-deployFTB @@ -2,8 +2,9 @@ . /start-utils +export FTB_DIR=/data/FeedTheBeast legacyJavaFixerUrl=http://ftb.cursecdn.com/FTB2/maven/net/minecraftforge/lex/legacyjavafixer/1.0/legacyjavafixer-1.0.jar -legacyJavaFixerPath=/data/FeedTheBeast/mods/legacyjavafixer.jar +legacyJavaFixerPath=${FTB_DIR}/mods/legacyjavafixer.jar export TYPE=FEED-THE-BEAST echo "Looking for Feed-The-Beast server modpack." @@ -68,5 +69,15 @@ if isTrue ${FTB_LEGACYJAVAFIXER} && [ ! -e ${legacyJavaFixerPath} ]; then curl -sSL -o ${legacyJavaFixerPath} ${legacyJavaFixerUrl} fi +if [ -e ${FTB_DIR}/FTBInstall.sh ]; then + pushd ${FTB_DIR} + sh ${FTB_DIR}/FTBInstall.sh + popd +elif [ -e ${FTB_DIR}/Install.sh ]; then + pushd ${FTB_DIR} + sh ${FTB_DIR}/Install.sh + popd +fi + # Continue to Final Setup exec /start-finalSetup01World $@