diff --git a/scripts/start-finalExec b/scripts/start-finalExec index 7d2b1091..bf4c2ac6 100755 --- a/scripts/start-finalExec +++ b/scripts/start-finalExec @@ -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 diff --git a/scripts/start-setupRbac b/scripts/start-setupRbac index a47efd2a..aad43bcf 100644 --- a/scripts/start-setupRbac +++ b/scripts/start-setupRbac @@ -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"