diff --git a/Dockerfile b/Dockerfile index e4af3488..6a140bf1 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.3.0 +ARG MC_HELPER_VERSION=1.4.0 RUN curl -fsSL https://github.com/itzg/mc-image-helper/releases/download/v${MC_HELPER_VERSION}/mc-image-helper-${MC_HELPER_VERSION}.tgz \ | tar -C /usr/share -zxf - \ && ln -s /usr/share/mc-image-helper-${MC_HELPER_VERSION}/bin/mc-image-helper /usr/bin diff --git a/start-deployFabric b/start-deployFabric index cb178bb2..97fa7be0 100755 --- a/start-deployFabric +++ b/start-deployFabric @@ -1,6 +1,7 @@ #!/bin/bash set -eu +# shellcheck source=start-utils . ${SCRIPTS:-/}start-utils requireVar VANILLA_VERSION @@ -32,7 +33,7 @@ if [[ ! -e ${SERVER} ]]; then if [[ ! -e $FABRIC_INSTALLER ]]; then log "Downloading $FABRIC_INSTALLER_URL ..." - if ! curl -o $FABRIC_INSTALLER -fsSL $FABRIC_INSTALLER_URL; then + if ! get -o "$FABRIC_INSTALLER" "$FABRIC_INSTALLER_URL"; then log "Failed to download from given location $FABRIC_INSTALLER_URL" exit 2 fi diff --git a/start-utils b/start-utils index dd5051b0..df784f58 100755 --- a/start-utils +++ b/start-utils @@ -180,3 +180,7 @@ function removeOldMods { find "$1" -mindepth 1 -maxdepth ${REMOVE_OLD_MODS_DEPTH:-16} -wholename "${REMOVE_OLD_MODS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_MODS_EXCLUDE:-}" -delete fi } + +function get() { + mc-image-helper get "$@" +} \ No newline at end of file