elias/ark-ac-server-tools
1
0
Fork 0
mirror of https://github.com/eliasstepanik/ark-ac-server-tools.git synced 2026-01-25 15:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ben Peddell 2016-09-09 04:30:33 +10:00
commit 658d044d0e
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/arkmanager
View File

@ -1338,6 +1338,7 @@ doWarn(){
# #
doUpdate() { doUpdate() {
local appupdate= local appupdate=
local bgupdate=
local updatetype=normal local updatetype=normal
local validate= local validate=
local modupdate= local modupdate=
@ -1443,6 +1444,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"
@ -1451,7 +1457,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