From e17c2ecc62183604bd4da3a9ef026dc27b32ce83 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Mon, 14 Apr 2025 12:29:27 -0500 Subject: [PATCH] Improve backup process of Mojang resource packs during upgrade (#507) --- bedrock-entry.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bedrock-entry.sh b/bedrock-entry.sh index b638a9c..544a5a2 100755 --- a/bedrock-entry.sh +++ b/bedrock-entry.sh @@ -125,8 +125,16 @@ if [[ ! -f "bedrock_server-${VERSION}" ]]; then mkdir -p "${bkupDir}/$d" echo "Backing up $d into $bkupDir" if [[ "$d" == "resource_packs" ]]; then - mv $d/{chemistry,vanilla} "${bkupDir}/$d/" - cp -a $d/ "${bkupDir}/$d/" + # Copy over resource packs to ensure user-supplied ones remain + cp -a $d/* "${bkupDir}/$d/" + + # ...however, need to fully remove Mojang provided resource packs to ensure consistent content + for rp_dir in chemistry vanilla editor; do + if [[ -d "$d/$rp_dir" ]]; then + # shellcheck disable=SC2115 + rm -rf "$d/$rp_dir" + fi + done else mv $d "${bkupDir}/" fi