For legacy CURSEFORGE, write ops/whitelist files in final directory (#2654)

This commit is contained in:
Geoff Bourne 2024-02-10 16:02:23 -06:00 committed by GitHub
parent ac7bf437ca
commit f3bec94065
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions

View File

@ -203,11 +203,6 @@ if [[ ${INIT_MEMORY} || ${MAX_MEMORY} ]]; then
fi
function copyFilesForCurseForge() {
# copy player modification files unconditionally since their
# processing into json is additive anyway
[ -f /data/ops.txt ] && cp -f /data/ops.txt "${FTB_DIR}/"
[ -f /data/white-list.txt ] && cp -f /data/white-list.txt "${FTB_DIR}/"
if [ ! -e "${FTB_DIR}/server-icon.png" ] && [ -e /data/server-icon.png ]; then
cp -f /data/server-icon.png "${FTB_DIR}/"
fi

View File

@ -22,6 +22,11 @@ elif [[ -v OVERRIDE_WHITELIST ]] && isTrue "${OVERRIDE_WHITELIST}"; then
fi
sharedArgs=(--version="$VERSION")
if [[ ${FTB_DIR:-} ]]; then
sharedArgs+=(--output-directory="$FTB_DIR")
else
sharedArgs+=(--output-directory=/data)
fi
if [[ -v OPS_FILE ]]; then
existing="$EXISTING_OPS_FILE"