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

Constrain GENERIC_PACK base detection depth (#1528)

Browse Source
This commit is contained in:
Geoff Bourne
2022-05-22 11:35:52 -05:00
committed by GitHub
parent f67d3948d2
commit 3e3abda71e
5 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/start-setupModpack
View File

@@ -216,18 +216,20 @@ if [[ "${GENERIC_PACKS}" ]]; then
elif isTrue "${FORCE_GENERIC_PACK_UPDATE}" || ! checkSum "${sum_file}"; then
log "Generic pack(s) are out of date. Re-applying..."
base_dir=/tmp/generic_pack_base
mkdir -p ${base_dir}
original_base_dir=/data/.tmp/generic_pack_base
base_dir=$original_base_dir
rm -rf "${base_dir}"
mkdir -p "${base_dir}"
for pack in "${packFiles[@]}"; do
isDebugging && ls -l "${pack}"
extract "${pack}" "${base_dir}"
done
# recalculate the actual base directory of content
base_dir=$(find "$base_dir" -type d \( -name mods -o -name plugins -o -name config \) -printf '%h' -quit)
base_dir=$(find "$base_dir" -maxdepth 3 -type d \( -name mods -o -name plugins -o -name config \) -printf '%h' -quit)
if [[ ! $base_dir ]]; then
log "ERROR: Unable to find content base of generic packs ${GENERIC_PACKS}. Directories:"
find /tmp/generic_pack_base -type d -printf ' - %P\n'
find $original_base_dir -maxdepth 3 -type d -printf ' - %P\n'
exit 1
fi
@@ -246,7 +248,7 @@ if [[ "${GENERIC_PACKS}" ]]; then
log "Applying generic pack ..."
cp -R -f "${base_dir}"/* /data
rm -rf /tmp/generic_pack_base
rm -rf $original_base_dir
log "Saving generic pack(s) checksum"
sha1sum "${packFiles[@]}" > "${sum_file}"