Merge branch 'master' into 1.6-dev

This commit is contained in:
Ben Peddell 2016-09-09 04:29:43 +10:00
commit 7a51994ca5

View File

@ -1316,6 +1316,7 @@ doWarn(){
#
doUpdate() {
local appupdate=
local bgupdate=
local updatetype=normal
local validate=
local modupdate=
@ -1413,6 +1414,11 @@ doUpdate() {
fi
fi
if [[ -f "$arkserverroot/$arkautorestartfile" && "$arkserverroot/$arkautorestartfile" -ot "${arkserverroot}/steamapps/appmanifest_${appid}.acf" ]]; then
echo "Server was updated while it was running"
bgupdate=1
fi
if [ -n "$downloadonly" ]; then
if [ -n "$appupdate" -a -n "$arkStagingDir" -a "$arkStagingDir" != "$arkserverroot" ]; then
echo "Server update downloaded"
@ -1421,7 +1427,7 @@ doUpdate() {
echo "Mod update downloaded"
fi
echo "Not applying update - download-only enabled"
elif [ -n "$appupdate" -o -n "$modupdate" ]; then
elif [ -n "$appupdate" -o -n "$modupdate" -o -n "$bgupdate" ]; then
arkversion="$(<"$arkserverroot/version.txt")"
if isTheServerRunning; then
if [ "$updatetype" == "safe" ]; then