mirror of
https://github.com/eliasstepanik/ark-ac-server-tools.git
synced 2026-01-12 10:58:28 +00:00
Merge branch '1.6-dev' into 1.6-dev.unstable
This commit is contained in:
commit
658d044d0e
@ -1338,6 +1338,7 @@ doWarn(){
|
||||
#
|
||||
doUpdate() {
|
||||
local appupdate=
|
||||
local bgupdate=
|
||||
local updatetype=normal
|
||||
local validate=
|
||||
local modupdate=
|
||||
@ -1443,6 +1444,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"
|
||||
@ -1451,7 +1457,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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user