amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-08-30 02:37:14 +00:00
Code Issues Projects Releases Wiki Activity

Output expected files when FTBA prep fails (#1656)

Browse Source
This commit is contained in:
Geoff Bourne
2022-08-06 16:24:47 -05:00
committed by GitHub
parent 75afcc2fce
commit 0f85646c69
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/start-deployFTBA
+7 -7
View File
@@ -32,7 +32,7 @@ elif ! [[ ${FTB_MODPACK_VERSION_ID} =~ [0-9]+ ]]; then
exit 1 exit 1
fi fi
if ! [ -f "${ftbInstallMarker}" ] || [ $(cat "${ftbInstallMarker}") != "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" ]; then if ! [ -f "${ftbInstallMarker}" ] || [ "$(cat "${ftbInstallMarker}")" != "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" ]; then
ftbInstaller=/data/ftb-installer ftbInstaller=/data/ftb-installer
if ! [[ -f "${ftbInstaller}" ]]; then if ! [[ -f "${ftbInstaller}" ]]; then
log "Downloading FTB installer" log "Downloading FTB installer"
@@ -68,10 +68,10 @@ fabricVersion=$(jq -r '.targets|unique[] | select(.name == "fabric") | .version'
mcVersion=$(jq -r '.targets|unique[] | select(.name == "minecraft") | .version' version.json) mcVersion=$(jq -r '.targets|unique[] | select(.name == "minecraft") | .version' version.json)
variants=( variants=(
forge-${mcVersion}-${forgeVersion}.jar "forge-${mcVersion}-${forgeVersion}.jar"
forge-${mcVersion}-${forgeVersion}-universal.jar "forge-${mcVersion}-${forgeVersion}-universal.jar"
forge-${mcVersion}-${forgeVersion}-${mcVersion}-universal.jar "forge-${mcVersion}-${forgeVersion}-${mcVersion}-universal.jar"
fabric-${mcVersion}-${fabricVersion}-server-launch.jar "fabric-${mcVersion}-${fabricVersion}-server-launch.jar"
run.sh run.sh
) )
for f in "${variants[@]}"; do for f in "${variants[@]}"; do
@@ -82,10 +82,10 @@ for f in "${variants[@]}"; do
done done
if ! [ -v SERVER ]; then if ! [ -v SERVER ]; then
log "ERROR unable to locate the installed FTB server jar" log "ERROR unable to locate the installed FTB server jar"
ls *.jar log " Tried looking for ${variants[*]}"
exit 2 exit 2
fi fi
export FAMILY=FORGE export FAMILY=FORGE
exec ${SCRIPTS:-/}start-setupWorld $@ exec "${SCRIPTS:-/}start-setupWorld" "$@"