From 80b8d491acdc004f4aee485987a78c0ddea28d6b Mon Sep 17 00:00:00 2001
From: Roeland Reyniers <roeland@bythepixel.com>
Date: Sat, 3 Sep 2016 13:49:49 -0600
Subject: [PATCH 1/2] Fix error typo

---
 netinstall.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netinstall.sh b/netinstall.sh
index e1e679a..a8bee95 100644
--- a/netinstall.sh
+++ b/netinstall.sh
@@ -59,7 +59,7 @@ case "$status" in
     ;;
 
   "1")
-    echo "Something where wrong :("
+    echo "Something went wrong :( Make sure you meet the Prerequisites found in the readme."
     ;;
   "2")
     echo "WARNING: A previous version of ARK Server Tools was detected in your system, your old configuration was not overwritten. You may need to manually update it."

From 0c2bb68b2e333f585ea2b40774b8a36908bdbb99 Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Wed, 7 Sep 2016 05:32:11 +1000
Subject: [PATCH 2/2] Fix double-start when auto-update is enabled

---
 tools/arkmanager | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tools/arkmanager b/tools/arkmanager
index 70e34b1..2ddb4d0 100755
--- a/tools/arkmanager
+++ b/tools/arkmanager
@@ -752,7 +752,7 @@ doStart() {
     if [ "$arkAutoUpdateOnStart" == "true" ]; then
       if ! [[ " $* " =~ " --noautoupdate " ]]; then
         echo "Updating server"
-        doUpdate --update-mods
+        doUpdate --update-mods --no-autostart
       fi
     fi
     tput sc
@@ -991,6 +991,7 @@ doUpdate() {
   local modupdate=
   local saveworld=
   local downloadonly=
+  local noautostart=
 
   for arg in "$@"; do
     if [ "$arg" == "--force" ]; then
@@ -1010,6 +1011,8 @@ doUpdate() {
       modupdate=1
     elif [ "$arg" == "--backup" ]; then
       arkBackupPreUpdate=true
+    elif [ "$arg" == "--no-autostart" ]; then
+      noautostart=1
     elif [[ "$arg" =~ ^--stagingdir= ]]; then
       arkStagingDir="${ark#--stagingdir=}"
     elif [ "$arg" == "--downloadonly" ]; then
@@ -1174,10 +1177,12 @@ doUpdate() {
 
     rm -f "${arkserverroot}/.ark-update.lock"
     # we restart the server only if it was started before the update
-    if [ $serverWasAlive -eq 1 ] || [ -f "${arkserverroot}/.startAfterUpdate" ]; then
-      rm -f "${arkserverroot}/.startAfterUpdate"
-      rm -f "${arkserverroot}/.ark-update.lock"
-      doStart --noautoupdate
+    if [ -z "$noautostart" ]; then
+      if [ $serverWasAlive -eq 1 ] || [ -f "${arkserverroot}/.startAfterUpdate" ]; then
+        rm -f "${arkserverroot}/.startAfterUpdate"
+        rm -f "${arkserverroot}/.ark-update.lock"
+        doStart --noautoupdate
+      fi
     fi
   else
     echo "Your server is already up to date! The most recent version is ${bnumber}."