From 94854f8d09c0336efb53a4e66bdabc8201069422 Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Sun, 22 Nov 2015 00:04:18 +1000
Subject: [PATCH] Move check for ARK server exec to instance execution

---
 tools/arkmanager | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/arkmanager b/tools/arkmanager
index a26c7b2..9a8d6a5 100755
--- a/tools/arkmanager
+++ b/tools/arkmanager
@@ -191,7 +191,7 @@ checkConfig() {
 
   # Environment configuration
   # arkserverexec
-  if [ ! -f "$arkserverroot/$arkserverexec" ] ; then
+  if [ -n "$arkserverroot" ] && [ ! -f "$arkserverroot/$arkserverexec" ] ; then
     echo -e "[" "$YELLOW" "WARN" "$NORMAL" "]" "\tYour ARK server exec could not be found."
   fi
 
@@ -1516,7 +1516,7 @@ useConfig() {
   for varname in "${!configfile_@}"; do
     if [ "configfile_$1" == "$varname" ]; then
       source "${!varname}"
-      return
+      break
     fi
   done
   if [ -z "$arkserverroot" ]; then
@@ -1686,6 +1686,7 @@ while true; do
   (
     echo "Running command '${command}' for instance '${instance}'"
     useConfig "$instance"
+    checkConfig
 
     case "$command" in
       run)