From 0b5a6f0cbac6155e3ffc187046034ac877370aa3 Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Sun, 15 Nov 2015 00:23:32 +1000
Subject: [PATCH] Fix a couple of bugs in update --warn

* Due to a bug in the minutes remaining check,
  the warning period was defaulting to 90 seconds,
  when it should have defaulted to 60 minutes.
* The time between 2 minutes and 90 seconds was
  60 seconds, when it should be 30 seconds
---
 tools/arkmanager | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/arkmanager b/tools/arkmanager
index 0bd1ab4..656d24b 100755
--- a/tools/arkmanager
+++ b/tools/arkmanager
@@ -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=$!