amorfo77/docker-minecraft-server
1
0 Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-11-06 08:49:22 +00:00
Code Issues Projects Releases Wiki Activity

Ensure legacy whitelist overrides work like ops overrides (#3289)

Browse Source
This commit is contained in:
August Abt authored and GitHub committed 2025-02-02 14:48:41 -06:00
1 parent 7cdb7d398c
commit 5742a34658
1 file changed
+8 -3
Download Patch File Download Diff File Expand all files Collapse all files
scripts/start-setupRbac
+8 -3
View File
@@ -77,13 +77,18 @@ if [[ -v WHITELIST_FILE ]]; then
fi fi
if [[ -v WHITELIST ]]; then if [[ -v WHITELIST ]]; then
args=() args=()
if isTrue "${APPEND_WHITELIST:-false}" || isFalse "${OVERRIDE_WHITELIST:-true}"; then
args+=(--append-only)
fi
existing="$EXISTING_WHITELIST_FILE" existing="$EXISTING_WHITELIST_FILE"
if [[ "$EXISTING_WHITELIST_FILE" = SYNC_FILE_MERGE_LIST ]]; then if [[ "$EXISTING_WHITELIST_FILE" = SYNC_FILE_MERGE_LIST ]]; then
existing=MERGE existing=MERGE
fi fi
# legacy option
if [[ -v APPEND_WHITELIST ]] && isTrue "${APPEND_WHITELIST}"; then
existing=MERGE
fi
# legacy option
if [[ -v OVERRIDE_WHITELIST ]] && isFalse "${OVERRIDE_WHITELIST}"; then
existing=SKIP
fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
mc-image-helper manage-users \ mc-image-helper manage-users \
"${sharedArgs[@]}" "${args[@]}" \ "${sharedArgs[@]}" "${args[@]}" \