diff --git a/Dockerfile b/Dockerfile index 26d78bc5..6c0b6fda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,7 +60,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz -ARG MC_HELPER_VERSION=1.9.6 +ARG MC_HELPER_VERSION=1.9.10 ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/v${MC_HELPER_VERSION} RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \ | tar -C /usr/share -zxf - \ diff --git a/scripts/start-deployForge b/scripts/start-deployForge index c531caaf..85386713 100755 --- a/scripts/start-deployForge +++ b/scripts/start-deployForge @@ -11,8 +11,8 @@ get_installer() { log "Downloading $normForgeVersion" forgeFileNames=" - $normForgeVersion/forge-$normForgeVersion-installer.jar $shortForgeVersion/forge-$shortForgeVersion-installer.jar + $normForgeVersion/forge-$normForgeVersion-installer.jar " for fn in $forgeFileNames; do @@ -102,7 +102,7 @@ resolve_versions() { ;; RECOMMENDED) - if ! FORGE_VERSION=$(get --json-path ".promos['$VANILLA_VERSION-recommended']" "$promosUrl"); then + if ! FORGE_VERSION=$(get -s --json-path ".promos['$VANILLA_VERSION-recommended']" "$promosUrl"); then if ! FORGE_VERSION=$(get --json-path ".promos['$VANILLA_VERSION-latest']" "$promosUrl"); then log "ERROR: Version $VANILLA_VERSION is not supported by Forge" log " Refer to http://files.minecraftforge.net/ for supported versions"