Merge branch 'master' into 1.6-dev

This commit is contained in:
Ben Peddell 2016-08-30 14:42:51 +10:00
commit 187015e69d

View File

@ -1506,6 +1506,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"