amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-02-17 07:03:57 +00:00
Code Issues Projects Releases Wiki Activity

Improve variable naming with MODRINTH_MODPACK_VERSION_TYPE and MODRINTH_PROJECTS_DEFAULT_VERSION_TYPE (#3716)

Browse Source
This commit is contained in:
Geoff Bourne
2025-10-17 17:05:09 -05:00
committed by GitHub
parent 532f906d32
commit 998b61de0d
6 changed files with 123 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/start-deployModrinth
View File

@@ -40,13 +40,14 @@ fi
case "${VERSION^^}" in
LATEST)
: "${MODRINTH_DEFAULT_VERSION_TYPE:=release}"
# need to be backward compatible with old variable name, MODRINTH_DEFAULT_VERSION_TYPE
: "${MODRINTH_MODPACK_VERSION_TYPE:=${MODRINTH_DEFAULT_VERSION_TYPE:-release}}"
;;
SNAPSHOT)
: "${MODRINTH_DEFAULT_VERSION_TYPE:=beta}"
: "${MODRINTH_MODPACK_VERSION_TYPE:=${MODRINTH_DEFAULT_VERSION_TYPE:-beta}}"
;;
*)
: "${MODRINTH_DEFAULT_VERSION_TYPE:=release}"
: "${MODRINTH_MODPACK_VERSION_TYPE:=${MODRINTH_DEFAULT_VERSION_TYPE:-release}}"
args+=("--game-version=$VERSION")
;;
esac
@@ -61,7 +62,7 @@ setArg() {
}
setArg --loader MODRINTH_LOADER
setArg --version MODRINTH_VERSION
setArg --default-version-type MODRINTH_DEFAULT_VERSION_TYPE
setArg --default-version-type MODRINTH_MODPACK_VERSION_TYPE
setArg --exclude-files MODRINTH_EXCLUDE_FILES
setArg --force-include-files MODRINTH_FORCE_INCLUDE_FILES
setArg --overrides-exclusions MODRINTH_OVERRIDES_EXCLUSIONS

5
scripts/start-setupModpack
View File

@@ -253,7 +253,8 @@ function handleGenericPacks() {
}
function handleModrinthProjects() {
: "${MODRINTH_ALLOWED_VERSION_TYPE:=release}"
# need to be backward compatible with old variable name, MODRINTH_ALLOWED_VERSION_TYPE
: "${MODRINTH_PROJECTS_DEFAULT_VERSION_TYPE:=${MODRINTH_ALLOWED_VERSION_TYPE:-release}}"
: "${MODRINTH_DOWNLOAD_DEPENDENCIES:=none}"
if [[ -v MODRINTH_DOWNLOAD_OPTIONAL_DEPENDENCIES ]]; then
logWarning "The variable MODRINTH_DOWNLOAD_OPTIONAL_DEPENDENCIES is removed."
@@ -283,7 +284,7 @@ function handleModrinthProjects() {
--game-version="${VERSION}" \
--loader="$loader" \
--download-dependencies="$MODRINTH_DOWNLOAD_DEPENDENCIES" \
--allowed-version-type="$MODRINTH_ALLOWED_VERSION_TYPE"
--allowed-version-type="$MODRINTH_PROJECTS_DEFAULT_VERSION_TYPE"
fi
}