Skip to content

Commit 0f85646

Browse files
authored
Output expected files when FTBA prep fails (#1656)
1 parent 75afcc2 commit 0f85646

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

scripts/start-deployFTBA

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ elif ! [[ ${FTB_MODPACK_VERSION_ID} =~ [0-9]+ ]]; then
3232
exit 1
3333
fi
3434

35-
if ! [ -f "${ftbInstallMarker}" ] || [ $(cat "${ftbInstallMarker}") != "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" ]; then
35+
if ! [ -f "${ftbInstallMarker}" ] || [ "$(cat "${ftbInstallMarker}")" != "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" ]; then
3636
ftbInstaller=/data/ftb-installer
3737
if ! [[ -f "${ftbInstaller}" ]]; then
3838
log "Downloading FTB installer"
@@ -68,10 +68,10 @@ fabricVersion=$(jq -r '.targets|unique[] | select(.name == "fabric") | .version'
6868
mcVersion=$(jq -r '.targets|unique[] | select(.name == "minecraft") | .version' version.json)
6969

7070
variants=(
71-
forge-${mcVersion}-${forgeVersion}.jar
72-
forge-${mcVersion}-${forgeVersion}-universal.jar
73-
forge-${mcVersion}-${forgeVersion}-${mcVersion}-universal.jar
74-
fabric-${mcVersion}-${fabricVersion}-server-launch.jar
71+
"forge-${mcVersion}-${forgeVersion}.jar"
72+
"forge-${mcVersion}-${forgeVersion}-universal.jar"
73+
"forge-${mcVersion}-${forgeVersion}-${mcVersion}-universal.jar"
74+
"fabric-${mcVersion}-${fabricVersion}-server-launch.jar"
7575
run.sh
7676
)
7777
for f in "${variants[@]}"; do
@@ -82,10 +82,10 @@ for f in "${variants[@]}"; do
8282
done
8383
if ! [ -v SERVER ]; then
8484
log "ERROR unable to locate the installed FTB server jar"
85-
ls *.jar
85+
log " Tried looking for ${variants[*]}"
8686
exit 2
8787
fi
8888

8989
export FAMILY=FORGE
9090

91-
exec ${SCRIPTS:-/}start-setupWorld $@
91+
exec "${SCRIPTS:-/}start-setupWorld" "$@"

0 commit comments

Comments
 (0)