From 12b85ec64dacac0b9e63ab002ee6c5695760b235 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 22 Apr 2016 22:53:08 +0100
Subject: [PATCH] Fixed not detecting config dir

---
 NS2Combat/ns2cserver        | 9 +++++----
 NaturalSelection2/ns2server | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/NS2Combat/ns2cserver b/NS2Combat/ns2cserver
index dab5e6e62..9d1eada32 100644
--- a/NS2Combat/ns2cserver
+++ b/NS2Combat/ns2cserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="150316"
+version="220416"
 
 #### Variables ####
 
@@ -32,8 +32,6 @@ servername="NS2C Server"
 webadminuser="admin"
 webadminpass="admin"
 webadminport="8080"
-configpath="server1"
-modstorage="server1/Workshop"
 mods=""
 password=""
 # Add the following line to the parms if you want a private server. Ensuring
@@ -42,7 +40,7 @@ password=""
 
 # http://wiki.unknownworlds.com/ns2/Dedicated_Server
 fn_parms(){
-parms="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser ${webadminuser} -webpassword \"${webadminpass}\" -webport ${webadminport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${rootdir}/${configpath}\" -modstorage \"${rootdir}/${modstorage}\" -mods \"${mods}\""
+parms="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser ${webadminuser} -webpassword \"${webadminpass}\" -webport ${webadminport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -modstorage \"${modstoragedir}\" -mods \"${mods}\""
 }
 
 #### Advanced Variables ####
@@ -72,6 +70,9 @@ filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}"
 executabledir="${filesdir}/ia32"
 executable="./ns2combatserver_linux32"
+servercfgdir="${rootdir}/server1"
+servercfgfullpath="${servercfgdir}"
+modstoragedir="${servercfgdir}/Workshop"
 backupdir="${rootdir}/backups"
 
 # Logging
diff --git a/NaturalSelection2/ns2server b/NaturalSelection2/ns2server
index 09bfab35a..206a652f8 100644
--- a/NaturalSelection2/ns2server
+++ b/NaturalSelection2/ns2server
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="150316"
+version="220416"
 
 #### Variables ####
 
@@ -32,8 +32,6 @@ servername="NS2 Server"
 webadminuser="admin"
 webadminpass="admin"
 webadminport="8080"
-configpath="server1"
-modstorage="server1/Workshop"
 mods=""
 password=""
 # Add the following line to the parms if you want a private server. Ensuring
@@ -42,7 +40,7 @@ password=""
 
 # http://wiki.unknownworlds.com/ns2/Dedicated_Server
 fn_parms(){
-parms="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser ${webadminuser} -webpassword \"${webadminpass}\" -webport ${webadminport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${rootdir}/${configpath}\" -modstorage \"${rootdir}/${modstorage}\" -mods \"${mods}\""
+parms="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser ${webadminuser} -webpassword \"${webadminpass}\" -webport ${webadminport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -modstorage \"${modstoragedir}\" -mods \"${mods}\""
 }
 
 #### Advanced Variables ####
@@ -72,6 +70,9 @@ filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}"
 executabledir="${filesdir}"
 executable="./server_linux32"
+servercfgdir="${rootdir}/server1"
+servercfgfullpath="${servercfgdir}"
+modstoragedir="${servercfgdir}/Workshop"
 backupdir="${rootdir}/backups"
 
 # Logging