salt/docker-minecraft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ignore existing files when unpacking server zippies

Browse Source
This commit is contained in:
Salt 2021-11-06 14:27:29 -05:00
parent 62c4ef86af
commit 82715dcd5b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
start-server.sh
View File

@ -16,7 +16,7 @@ if [ -n "$FORGE_PACK_ZIP" ]; then
unzip pack.zip unzip pack.zip
directory="$(find . -type d -iname "mods" -execdir pwd \; | sort -n | head -n 1)" directory="$(find . -type d -iname "mods" -execdir pwd \; | sort -n | head -n 1)"
echo "Found modpack directory: $directory" echo "Found modpack directory: $directory"
rsync -av "$directory"/ /minecraft/ rsync -av --ignore-existing "$directory"/ /minecraft/
popd > /dev/null 2>&1 popd > /dev/null 2>&1
fi fi
@ -27,7 +27,7 @@ if [ -n "$CONFIG_REPO" ]; then
pushd "$tmpdir" > /dev/null 2>&1 pushd "$tmpdir" > /dev/null 2>&1
git clone "$CONFIG_REPO" . git clone "$CONFIG_REPO" .
rm -rf .git rm -rf .git
rsync -av ./ /minecraft/ rsync -av --delete ./ /minecraft/
popd > /dev/null 2>&1 popd > /dev/null 2>&1
fi fi