diff --git a/scripts/start-deployAutoCF b/scripts/start-deployAutoCF index 54f41ddf..ffafa6aa 100755 --- a/scripts/start-deployAutoCF +++ b/scripts/start-deployAutoCF @@ -22,22 +22,11 @@ set -eu : "${CF_DOWNLOADS_REPO=$([ -d /downloads ] && echo '/downloads' || echo '')}" : "${CF_MODPACK_MANIFEST:=}" : "${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_MOD_LOADER_VERSION:=}" # Override mod loader version : "${CF_USE_HTTP2:=false}" # CF downloads are faster with HTTP 1.1 resultsFile=/data/.install-curseforge.env -if [[ -n ${CF_API_KEY_FILE} ]]; then - if [[ -r "${CF_API_KEY_FILE}" ]]; then - CF_API_KEY="$(cat "${CF_API_KEY_FILE}")" - export CF_API_KEY - else - logError "CF_API_KEY_FILE is not readable: ${CF_API_KEY_FILE}" - exit 1 - fi -fi - isDebugging && set -x ensureRemoveAllModsOff "MODPACK_PLATFORM=AUTO_CURSEFORGE" diff --git a/scripts/start-setupModpack b/scripts/start-setupModpack index e5b03bf2..46234c3f 100755 --- a/scripts/start-setupModpack +++ b/scripts/start-setupModpack @@ -9,23 +9,12 @@ set -e -o pipefail : "${PLUGINS_FILE:=}" : "${REMOVE_OLD_MODS_DEPTH:=1} " : "${REMOVE_OLD_MODS_INCLUDE:=*.jar,*-version.json}" -: "${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:=}" # shellcheck source=start-utils . "$(dirname "$0")/start-utils" -if [[ -n ${CF_API_KEY_FILE} ]]; then - if [[ -r "${CF_API_KEY_FILE}" ]]; then - CF_API_KEY="$(cat "${CF_API_KEY_FILE}")" - export CF_API_KEY - else - logError "CF_API_KEY_FILE is not readable: ${CF_API_KEY_FILE}" - exit 1 - fi -fi - isDebugging && set -x sum_file=/data/.generic_pack.sum