Skip to content

Commit f3bec94

Browse files
authored
For legacy CURSEFORGE, write ops/whitelist files in final directory (#2654)
1 parent ac7bf43 commit f3bec94

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

scripts/start-finalExec

-5
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,6 @@ if [[ ${INIT_MEMORY} || ${MAX_MEMORY} ]]; then
203203
fi
204204

205205
function copyFilesForCurseForge() {
206-
# copy player modification files unconditionally since their
207-
# processing into json is additive anyway
208-
[ -f /data/ops.txt ] && cp -f /data/ops.txt "${FTB_DIR}/"
209-
[ -f /data/white-list.txt ] && cp -f /data/white-list.txt "${FTB_DIR}/"
210-
211206
if [ ! -e "${FTB_DIR}/server-icon.png" ] && [ -e /data/server-icon.png ]; then
212207
cp -f /data/server-icon.png "${FTB_DIR}/"
213208
fi

scripts/start-setupRbac

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ elif [[ -v OVERRIDE_WHITELIST ]] && isTrue "${OVERRIDE_WHITELIST}"; then
2222
fi
2323

2424
sharedArgs=(--version="$VERSION")
25+
if [[ ${FTB_DIR:-} ]]; then
26+
sharedArgs+=(--output-directory="$FTB_DIR")
27+
else
28+
sharedArgs+=(--output-directory=/data)
29+
fi
2530

2631
if [[ -v OPS_FILE ]]; then
2732
existing="$EXISTING_OPS_FILE"

0 commit comments

Comments
 (0)