Auto-merging via docker-versions-create

# Conflicts:
#	start-deployFTB
#	start-minecraftFinalSetup
This commit is contained in:
Geoff Bourne committed 2020-07-26 08:35:13 -05:00
commit eba1ef6ab9
7 files changed
+123 -43

No files matched your search

+1 -4
View File
@@ -64,11 +64,8 @@ case "X$VERSION" in
XSNAPSHOT|Xsnapshot)
VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.snapshot')
;;
X[1-9]*)
VANILLA_VERSION=$VERSION
;;
*)
VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.release')
VANILLA_VERSION=$VERSION
;;
esac
export VANILLA_VERSION