amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-03-29 09:52:46 +00:00
Code Issues Projects Releases Wiki Activity

Merged from master

Browse Source
This commit is contained in:
Geoff Bourne
2020-11-25 15:59:43 -06:00
parent 34c45ec883 a368f4cf57
commit aa43926da2
11 changed files with 160 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
start-minecraftFinalSetup
View File

@@ -54,7 +54,10 @@ done
if [ -d /mods ]; then
log "Copying any mods over..."
mkdir -p /data/mods
rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs --update /mods /data
if isTrue "${REMOVE_OLD_MODS}"; then
rsyncArgs=(--delete)
fi
rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /mods /data
fi
[ -d /data/config ] || mkdir /data/config
@@ -173,7 +176,7 @@ function copyFilesForCurseForge() {
cp -f /data/eula.txt "${FTB_DIR}/"
}
mcServerRunnerArgs="--stop-duration 60s"
mcServerRunnerArgs="--stop-duration ${STOP_DURATION:-60}s"
if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
if isTrue ${DEBUG_EXEC}; then
set -x