mirror of
https://github.com/eliasstepanik/ark-ac-server-tools.git
synced 2026-01-26 08:18:27 +00:00
Merge branch 'master' into 1.6-dev
This commit is contained in:
commit
7a51994ca5
@ -1316,6 +1316,7 @@ doWarn(){
|
|||||||
#
|
#
|
||||||
doUpdate() {
|
doUpdate() {
|
||||||
local appupdate=
|
local appupdate=
|
||||||
|
local bgupdate=
|
||||||
local updatetype=normal
|
local updatetype=normal
|
||||||
local validate=
|
local validate=
|
||||||
local modupdate=
|
local modupdate=
|
||||||
@ -1413,6 +1414,11 @@ doUpdate() {
|
|||||||
fi
|
fi
|
||||||
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 "$downloadonly" ]; then
|
||||||
if [ -n "$appupdate" -a -n "$arkStagingDir" -a "$arkStagingDir" != "$arkserverroot" ]; then
|
if [ -n "$appupdate" -a -n "$arkStagingDir" -a "$arkStagingDir" != "$arkserverroot" ]; then
|
||||||
echo "Server update downloaded"
|
echo "Server update downloaded"
|
||||||
@ -1421,7 +1427,7 @@ doUpdate() {
|
|||||||
echo "Mod update downloaded"
|
echo "Mod update downloaded"
|
||||||
fi
|
fi
|
||||||
echo "Not applying update - download-only enabled"
|
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")"
|
arkversion="$(<"$arkserverroot/version.txt")"
|
||||||
if isTheServerRunning; then
|
if isTheServerRunning; then
|
||||||
if [ "$updatetype" == "safe" ]; then
|
if [ "$updatetype" == "safe" ]; then
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user