From 362fa3a3c5bd507ee7610e515d3d91434390931d Mon Sep 17 00:00:00 2001
From: FezVrasta <fez@tekhy.net>
Date: Wed, 24 Jun 2015 12:01:37 +0200
Subject: [PATCH] standardize server options, now they work all in the same way

---
 tools/arkmanager     |  9 ++-------
 tools/arkmanager.cfg | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/tools/arkmanager b/tools/arkmanager
index 7520d41..2f4b7a6 100755
--- a/tools/arkmanager
+++ b/tools/arkmanager
@@ -118,7 +118,7 @@ function isTheServerRunning(){
 # Check if the server is down and not visible in steam server list
 #
 function isTheServerDown(){
-  lsof -i |grep $arkserverport > /dev/null
+  lsof -i |grep $ark_Port > /dev/null
   result=$?
   return $result
 }
@@ -131,12 +131,7 @@ doStart() {
   if isTheServerRunning; then
     echo "The server is already running"
   else
-    ark_SessionName="${ark_SessionName:-${sessionname}}"
-    ark_Port="${ark_Port:-${arkserverport}}"
-    ark_QueryPort="${ark_QueryPort:-${arkqueryport}}"
-    ark_ServerPassword="${ark_ServerPassword:-${arkserverpass}}"
-    ark_ServerAdminPassword="${ark_ServerAdminPassword:-${arkserverapass}}"
-    arkserveropts="TheIsland"
+    arkserveropts=$serverMap
 
     # bring in ark_... options
     for varname in "${!ark_@}"; do
diff --git a/tools/arkmanager.cfg b/tools/arkmanager.cfg
index b3af50c..b0571d1 100644
--- a/tools/arkmanager.cfg
+++ b/tools/arkmanager.cfg
@@ -3,16 +3,19 @@ steamcmdroot="/home/steam/steamcmd"                                 # path of yo
 steamcmdexec="steamcmd.sh"                                          # name of steamcmd executable
 steamcmd_user="steam"                                               # name of the system user who own steamcmd folder
 
-# config Server
-sessioname=YourLinuxSessionName
+# config environment
 arkserverroot="/home/steam/ARK"                                     # path of your ARK server files (default ~/ARK)
 arkserverexec="ShooterGame/Binaries/Linux/ShooterGameServer"        # name of ARK server executable
-arkqueryport="27016"                                                # ARK query port (default 27016)
-arkserverport="7778"                                                # ARK server port (default 7778)
-arkserverpass="SERVERPASSWORD"                                      # ARK server password, empty: no password required to login
-arkserverapass="ADMINPASSWORD"                                      # ARK server admin password, KEEP IT SAFE!
 
-# other options - use ark_<optionname>=<value>
+# ARK server options - use ark_<optionname>=<value>
+# comment out these values if you want to define them
+# inside your GameUserSettings.ini file
+serverMap="TheIsland"                                               # server map (default TheIsland)
+ark_SessionName="ARK Server Tools"                                  # if your session name needs special characters please use the .ini instead
+ark_Port="7778"                                                     # ARK server port (default 7778)
+ark_QueryPort="27016"                                               # ARK query port (default 27016)
+ark_ServerPassword=""                                               # ARK server password, empty: no password required to login
+ark_ServerAdminPassword="keyboardcat"                               # ARK server admin password, KEEP IT SAFE!
 ark_MaxPlayers="70"
 
 # config Service