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

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

View File

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