Skip to content

Commit 0d834dd

Browse files
authored
Fixed VERSION_FROM_MODRINTH_PROJECTS when a project has a shorter list (#3605)
1 parent 0a5ac8a commit 0d834dd

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
4848
--var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \
4949
--from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
5050

51-
ARG MC_HELPER_VERSION=1.48.4
51+
ARG MC_HELPER_VERSION=1.48.5
5252
ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
5353
# used for cache busting local copy of mc-image-helper
5454
ARG MC_HELPER_REV=1

scripts/start-deployModrinth

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ resultsFile=/data/.install-modrinth.env
1414
: "${MODRINTH_FORCE_INCLUDE_FILES=}"
1515
: "${MODRINTH_OVERRIDES_EXCLUSIONS=}"
1616
: "${MODRINTH_DEFAULT_EXCLUDE_INCLUDES=/image/modrinth-exclude-include.json}"
17+
: "${MODRINTH_FORCE_MODLOADER_REINSTALL:=${FORCE_MODLOADER_REINSTALL:-false}}"
1718

1819
if [[ ! $MODRINTH_MODPACK ]]; then
1920
logError "MODRINTH_MODPACK must be set when using TYPE/MODPACK_PLATFORM/MOD_PLATFORM of MODRINTH"
@@ -33,6 +34,9 @@ args=(
3334
if [[ $MODRINTH_IGNORE_MISSING_FILES ]]; then
3435
args+=(--ignore-missing-files "$MODRINTH_IGNORE_MISSING_FILES")
3536
fi
37+
if isTrue "${MODRINTH_FORCE_MODLOADER_REINSTALL}"; then
38+
args+=(--force-modloader-reinstall)
39+
fi
3640

3741
case "${VERSION^^}" in
3842
LATEST)

0 commit comments

Comments
 (0)