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

Merge pull request #287 from klightspeed/1.5-dev#updatewarnfixes1

Browse Source 
Fix a couple of bugs in update --warn
This commit is contained in:
Fez Vrasta 2015-11-14 17:23:26 +01:00
commit c6fc1d84e5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/arkmanager
View File

@ -714,14 +714,14 @@ doUpdateWarn(){
warnminutes=60 warnminutes=60
fi fi
local warnintervals=( 90 60 45 30 20 15 10 5 4 3 2 1 ) local warnintervals=( 90 60 45 30 20 15 10 5 4 3 2 )
for warninterval in "${warnintervals[@]}"; do for warninterval in "${warnintervals[@]}"; do
if [ "`getServerPID`" != "$pid" ]; then if [ "`getServerPID`" != "$pid" ]; then
echo "Server has stopped. Aborting update" echo "Server has stopped. Aborting update"
return 1 return 1
fi fi
if (( arkwarnminutes > warninterval )); then if (( warnminutes > warninterval )); then
sleep 1m & sleep 1m &
sleeppid=$! sleeppid=$!
if [ -n "$msgWarnUpdateMinutes" ]; then if [ -n "$msgWarnUpdateMinutes" ]; then
@ -746,8 +746,8 @@ doUpdateWarn(){
fi fi
done done
local warnseconds=90 local warnseconds=120
warnintervals=( 60 45 30 20 15 10 5 0 ) warnintervals=( 90 60 45 30 20 15 10 5 0 )
for warninterval in "${warnintervals[@]}"; do for warninterval in "${warnintervals[@]}"; do
sleep $(( warnseconds - warninterval ))s & sleep $(( warnseconds - warninterval ))s &
sleeppid=$! sleeppid=$!