Converted vanilla downloads to image helper get

#1031
This commit is contained in:
Geoff Bourne
2021-10-10 12:05:37 -05:00
parent ec97c67aca
commit 57d9da96a1
4 changed files with 19 additions and 18 deletions
+9 -6
View File
@@ -2,14 +2,17 @@
set -euo pipefail
IFS=$'\n\t'
# shellcheck source=start-utils
. ${SCRIPTS:-/}start-utils
: ${EULA:=}
: ${PROXY:=}
: ${RCON_PASSWORD_FILE:=}
: "${EULA:=}"
: "${PROXY:=}"
: "${RCON_PASSWORD_FILE:=}"
shopt -s nullglob
isDebugging && set -x
#umask 002
export HOME=/data
@@ -63,10 +66,10 @@ export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.js
case "X$VERSION" in
X|XLATEST|Xlatest)
VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.release')
VANILLA_VERSION=$(get "$VERSIONS_JSON" | jq -r '.latest.release')
;;
XSNAPSHOT|Xsnapshot)
VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.snapshot')
VANILLA_VERSION=$(get "$VERSIONS_JSON" | jq -r '.latest.snapshot')
;;
*)
VANILLA_VERSION=$VERSION
@@ -124,7 +127,7 @@ case "${TYPE^^}" in
;;
VANILLA)
exec ${SCRIPTS:-/}start-deployVanilla "$@"
exec "${SCRIPTS:-/}start-deployVanilla" "$@"
;;
SPONGEVANILLA)