mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-04-02 03:42:43 +00:00
Add support of CF_API_KEY_FILE environment variable (#3396)
This commit is contained in:
@@ -24,6 +24,11 @@ set -eu
|
||||
|
||||
resultsFile=/data/.install-curseforge.env
|
||||
|
||||
if [[ -n ${CF_API_KEY_FILE} ]]; then
|
||||
CF_API_KEY="$(cat "${CF_API_KEY_FILE}")"
|
||||
export CF_API_KEY
|
||||
fi
|
||||
|
||||
isDebugging && set -x
|
||||
|
||||
ensureRemoveAllModsOff "MODPACK_PLATFORM=AUTO_CURSEFORGE"
|
||||
@@ -61,7 +66,7 @@ if ! mc-image-helper install-curseforge "${args[@]}"; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
applyResultsFile ${resultsFile}
|
||||
applyResultsFile "${resultsFile}"
|
||||
resolveFamily
|
||||
|
||||
exec "${SCRIPTS:-/}start-setupWorld" "$@"
|
||||
|
||||
@@ -13,6 +13,12 @@ set -e -o pipefail
|
||||
: "${REMOVE_OLD_MODS_INCLUDE:=*.jar,*-version.json}"
|
||||
sum_file=/data/.generic_pack.sum
|
||||
|
||||
|
||||
if [[ -n ${CF_API_KEY_FILE} ]]; then
|
||||
CF_API_KEY="$(cat "${CF_API_KEY_FILE}")"
|
||||
export CF_API_KEY
|
||||
fi
|
||||
|
||||
# shellcheck source=start-utils
|
||||
. "${SCRIPTS:-/}start-utils"
|
||||
isDebugging && set -x
|
||||
@@ -195,7 +201,7 @@ function handleGenericPacks() {
|
||||
|
||||
# Disable mods
|
||||
for mod in ${GENERIC_PACKS_DISABLE_MODS}; do
|
||||
log Disabling $mod
|
||||
log Disabling "$mod"
|
||||
find "${base_dir}" -name "$mod" -exec mv {} {}.disabled -v \;
|
||||
done
|
||||
|
||||
|
||||
Reference in New Issue
Block a user