From 05e8511e2233f59a17aee9fdeb81f7f4ad5837a4 Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Mon, 29 Aug 2016 20:44:11 +1000
Subject: [PATCH] Fix interaction between start and update

---
 tools/arkmanager | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/arkmanager b/tools/arkmanager
index 0cdf58d..5400da7 100755
--- a/tools/arkmanager
+++ b/tools/arkmanager
@@ -736,10 +736,11 @@ doRun() {
 # start function
 #
 doStart() {
+  touch "${arkserverroot}/.startAfterUpdate"
+
   if [ -f "${arkserverroot}/.ark-update.lock" ]; then
     local updatepid="$(<"${arkserverroot}/.ark-update.lock")"
     if kill -0 "$updatepid" >/dev/null 2>&1; then
-      touch "${arkserverroot}/.startAfterUpdate"
       echo "An update is currently in progress.  Start aborted"
       return 1
     fi
@@ -783,7 +784,9 @@ doStartAll(){
 # stop the ARK server
 #
 doStop() {
-  rm -f "${arkserverroot}/.startAfterUpdate"
+  if [ "$1" != "update" ]; then
+    rm -f "${arkserverroot}/.startAfterUpdate"
+  fi
 
   if isTheServerRunning; then
     if [[ " $* " =~ " --warn " ]]; then
@@ -1116,7 +1119,7 @@ doUpdate() {
       doSaveWorld
     fi
 
-    doStop
+    doStop update
 
     # If user wants to back-up, we do it here.