mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-10-13 07:27:15 +00:00
Use http/1.1 for CurseForge (#4155)
This commit is contained in:
1 parent
175004e656
commit
de75f2e671
3 files changed
+8
-1
No files matched your search
@@ -0,0 +1,2 @@
|
|||||||
|
*.sh text eol=lf
|
||||||
|
scripts/** text eol=lf
|
||||||
@@ -24,6 +24,7 @@ set -eu
|
|||||||
: "${CF_API_CACHE_DEFAULT_TTL:=}" # as ISO-8601 duration, such as P2D or PT12H
|
: "${CF_API_CACHE_DEFAULT_TTL:=}" # as ISO-8601 duration, such as P2D or PT12H
|
||||||
: "${CF_API_KEY_FILE:=}" # Path to file containing CurseForge API key
|
: "${CF_API_KEY_FILE:=}" # Path to file containing CurseForge API key
|
||||||
: "${CF_MOD_LOADER_VERSION:=}" # Override mod loader version
|
: "${CF_MOD_LOADER_VERSION:=}" # Override mod loader version
|
||||||
|
: "${CF_USE_HTTP2:=false}" # CF downloads are faster with HTTP 1.1
|
||||||
|
|
||||||
resultsFile=/data/.install-curseforge.env
|
resultsFile=/data/.install-curseforge.env
|
||||||
|
|
||||||
@@ -46,6 +47,7 @@ args=(
|
|||||||
--force-synchronize="$CF_FORCE_SYNCHRONIZE"
|
--force-synchronize="$CF_FORCE_SYNCHRONIZE"
|
||||||
--force-reinstall-modloader="$CF_FORCE_REINSTALL_MODLOADER"
|
--force-reinstall-modloader="$CF_FORCE_REINSTALL_MODLOADER"
|
||||||
--overrides-skip-existing="$CF_OVERRIDES_SKIP_EXISTING"
|
--overrides-skip-existing="$CF_OVERRIDES_SKIP_EXISTING"
|
||||||
|
--use-http2="$CF_USE_HTTP2"
|
||||||
)
|
)
|
||||||
setArg() {
|
setArg() {
|
||||||
arg="${1?}"
|
arg="${1?}"
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ set -e -o pipefail
|
|||||||
: "${REMOVE_OLD_MODS_DEPTH:=1} "
|
: "${REMOVE_OLD_MODS_DEPTH:=1} "
|
||||||
: "${REMOVE_OLD_MODS_INCLUDE:=*.jar,*-version.json}"
|
: "${REMOVE_OLD_MODS_INCLUDE:=*.jar,*-version.json}"
|
||||||
: "${CF_API_KEY_FILE:=}" # Path to file containing CurseForge API key
|
: "${CF_API_KEY_FILE:=}" # Path to file containing CurseForge API key
|
||||||
|
: "${CF_USE_HTTP2:=false}" # CF downloads are faster with HTTP 1.1
|
||||||
: "${MODRINTH_LOADER:=}"
|
: "${MODRINTH_LOADER:=}"
|
||||||
|
|
||||||
# shellcheck source=start-utils
|
# shellcheck source=start-utils
|
||||||
@@ -296,7 +297,9 @@ function handleModrinthProjects() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function handleCurseForgeFiles() {
|
function handleCurseForgeFiles() {
|
||||||
args=()
|
args=(
|
||||||
|
--use-http2="$CF_USE_HTTP2"
|
||||||
|
)
|
||||||
if usesMods && ! usesPlugins; then
|
if usesMods && ! usesPlugins; then
|
||||||
args+=(--default-category mc-mods)
|
args+=(--default-category mc-mods)
|
||||||
elif usesPlugins && ! usesMods; then
|
elif usesPlugins && ! usesMods; then
|
||||||
|
|||||||
Reference in new issue
Block a user