Merge branch '1.6-dev' into 1.6-dev.unstable

This commit is contained in:
Ben Peddell 2016-08-30 14:43:24 +10:00
commit 04a647428c

View File

@ -1526,6 +1526,7 @@ doUpdate() {
done
fi
rm -f "${arkserverroot}/.ark-update.lock"
# we restart the server only if it was started before the update
if [ $serverWasAlive -eq 1 ] || [ -f "${arkserverroot}/.startAfterUpdate" ]; then
rm -f "${arkserverroot}/.startAfterUpdate"