From 34d5576841e8d3976364667d8154b04959927215 Mon Sep 17 00:00:00 2001
From: Terry Wrist <me@ikejohnson.id.au>
Date: Tue, 25 Jul 2017 11:37:56 +0800
Subject: [PATCH 01/10] Change logfile used for update check

This changes the logfile that is used from the log generated by tmux to the log generated by the factorio binary. As logging is disabled in tmux 1.8, those users which may be stuck on that version cannot use the update functionality, as there is no log to go off of.
---
 lgsm/functions/update_factorio.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lgsm/functions/update_factorio.sh b/lgsm/functions/update_factorio.sh
index 6c3a70ff8..af611e1b5 100644
--- a/lgsm/functions/update_factorio.sh
+++ b/lgsm/functions/update_factorio.sh
@@ -26,7 +26,7 @@ fn_update_factorio_dl(){
 fn_update_factorio_currentbuild(){
 	# Gets current build info
 	# Checks if current build info is available. If it fails, then a server restart will be forced to generate logs.
-	if [ ! -f "${consolelogdir}/${servicename}-console.log" ]; then
+	if [ ! -f "${logdir}/server/factorio-current.log" ]; then
 		fn_print_error "Checking for update: factorio.com"
 		sleep 1
 		fn_print_error_nl "Checking for update: factorio.com: No logs with server version found"
@@ -41,7 +41,7 @@ fn_update_factorio_currentbuild(){
 		command_start.sh
 		sleep 1
 		# Check again and exit on failure.
-		if [ ! -f "${consolelogdir}/${servicename}-console.log" ]; then
+		if [ ! -f "${logdir}/server/factorio-current.log" ]; then
 			fn_print_fail_nl "Checking for update: factorio.com: Still No logs with server version found"
 			fn_script_log_fatal "Checking for update: factorio.com: Still No logs with server version found"
 			core_exit.sh
@@ -49,7 +49,7 @@ fn_update_factorio_currentbuild(){
 	fi
 
 	# Get current build from logs
-	currentbuild=$(grep "Loading mod base" "${consolelogdir}"/"${servicename}"-console.log 2> /dev/null|awk '{print $5}'|tail -1)
+	currentbuild=$(grep "Loading mod base" "${logdir}"/server/factorio-current.log 2> /dev/null|awk '{print $5}'|tail -1)
 	if [ -z "${currentbuild}" ]; then
 		fn_print_error_nl "Checking for update: factorio.com: Current build version not found"
 		fn_script_log_error "Checking for update: factorio.com: Current build version not found"
@@ -60,7 +60,7 @@ fn_update_factorio_currentbuild(){
 		command_stop.sh
 		exitbypass=1
 		command_start.sh
-		currentbuild=$(grep "Loading mod base" "${consolelogdir}"/"${servicename}"-console.log 2> /dev/null|awk '{print $5}'|tail -1)
+		currentbuild=$(grep "Loading mod base" "${logdir}"/server/factorio-current.log 2> /dev/null|awk '{print $5}'|tail -1)
 		if [ -z "${currentbuild}" ]; then
 			fn_print_fail_nl "Checking for update: factorio.com: Current build version still not found"
 			fn_script_log_fatal "Checking for update: factorio.com: Current build version still not found"

From 5622a9401e0d8978b64d4b60a20eea32713f35fd Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Fri, 28 Jul 2017 22:19:30 +0200
Subject: [PATCH 02/10] Corrected indentation

---
 lgsm/functions/update_mta.sh | 236 +++++++++++++++++------------------
 1 file changed, 118 insertions(+), 118 deletions(-)

diff --git a/lgsm/functions/update_mta.sh b/lgsm/functions/update_mta.sh
index 390b0aafc..b97b66807 100644
--- a/lgsm/functions/update_mta.sh
+++ b/lgsm/functions/update_mta.sh
@@ -9,64 +9,64 @@ local commandaction="Update"
 local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 
 fn_update_mta_dl(){
-        fn_fetch_file "http://linux.mtasa.com/dl/${numversion}/multitheftauto_linux_x64-${fullversion}.tar.gz" "${tmpdir}" "multitheftauto_linux_x64-${fullversion}.tar.gz"
-  mkdir "${tmpdir}/multitheftauto_linux_x64-${fullversion}"
-        fn_dl_extract "${tmpdir}" "multitheftauto_linux_x64-${fullversion}.tar.gz" "${tmpdir}/multitheftauto_linux_x64-${fullversion}"
-        echo -e "copying to ${filesdir}...\c"
-        fn_script_log "Copying to ${filesdir}"
-        cp -R "${tmpdir}/multitheftauto_linux_x64-${fullversion}/multitheftauto_linux_x64-${fullversion}/"* "${filesdir}"
-        local exitcode=$?
-        if [ "${exitcode}" == "0" ]; then
-                fn_print_ok_eol_nl
-        else
-                fn_print_fail_eol_nl
-        fi
+	fn_fetch_file "http://linux.mtasa.com/dl/${numversion}/multitheftauto_linux_x64-${fullversion}.tar.gz" "${tmpdir}" "multitheftauto_linux_x64-${fullversion}.tar.gz"
+	mkdir "${tmpdir}/multitheftauto_linux_x64-${fullversion}"
+	fn_dl_extract "${tmpdir}" "multitheftauto_linux_x64-${fullversion}.tar.gz" "${tmpdir}/multitheftauto_linux_x64-${fullversion}"
+	echo -e "copying to ${filesdir}...\c"
+	fn_script_log "Copying to ${filesdir}"
+	cp -R "${tmpdir}/multitheftauto_linux_x64-${fullversion}/multitheftauto_linux_x64-${fullversion}/"* "${filesdir}"
+	local exitcode=$?
+	if [ "${exitcode}" == "0" ]; then
+		fn_print_ok_eol_nl
+	else
+		fn_print_fail_eol_nl
+	fi
 }
 
 fn_update_mta_currentbuild(){
-        # Gets current build info
-        # Checks if current build info is available. If it fails, then a server restart will be forced to generate logs.
-        if [ ! -f "${gamelogdir}"/server.log ]; then
-                fn_print_error "Checking for update: linux.mtasa.com"
-                sleep 1
-                fn_print_error_nl "Checking for update: linux.mtasa.com: No logs with server version found"
-                fn_script_log_error "Checking for update: linux.mtasa.com: No logs with server version found"
-                sleep 1
-                fn_print_info_nl "Checking for update: linux.mtasa.com: Forcing server restart"
-                fn_script_log_info "Checking for update: linux.mtasa.com: Forcing server restart"
-                sleep 1
-                exitbypass=1
-                command_stop.sh
-                exitbypass=1
-                command_start.sh
-                sleep 1
-                # Check again and exit on failure.
-                if [ ! -f "${gamelogdir}"/server.log ]; then
-                        fn_print_fail_nl "Checking for update: linux.mtasa.com: Still No logs with server version found"
-                        fn_script_log_fatal "Checking for update: linux.mtasa.com: Still No logs with server version found"
-                        core_exit.sh
-                fi
-        fi
+	# Gets current build info
+	# Checks if current build info is available. If it fails, then a server restart will be forced to generate logs.
+	if [ ! -f "${gamelogdir}"/server.log ]; then
+		fn_print_error "Checking for update: linux.mtasa.com"
+		sleep 1
+		fn_print_error_nl "Checking for update: linux.mtasa.com: No logs with server version found"
+		fn_script_log_error "Checking for update: linux.mtasa.com: No logs with server version found"
+		sleep 1
+		fn_print_info_nl "Checking for update: linux.mtasa.com: Forcing server restart"
+		fn_script_log_info "Checking for update: linux.mtasa.com: Forcing server restart"
+		sleep 1
+		exitbypass=1
+		command_stop.sh
+		exitbypass=1
+		command_start.sh
+		sleep 1
+		# Check again and exit on failure.
+		if [ ! -f "${gamelogdir}"/server.log ]; then
+			fn_print_fail_nl "Checking for update: linux.mtasa.com: Still No logs with server version found"
+			fn_script_log_fatal "Checking for update: linux.mtasa.com: Still No logs with server version found"
+			core_exit.sh
+		fi
+	fi
 
-        # Get current build from logs
-        currentbuild=$(cat "${gamelogdir}"/server.log | grep "= Multi Theft Auto: San Andreas v" | awk '{ print $7 }'| sed -r 's/^.{1}//' | tail -1)
-        if [ -z "${currentbuild}" ]; then
-                fn_print_error_nl "Checking for update: linux.mtasa.com: Current build version not found"
-                fn_script_log_error "Checking for update: linux.mtasa.com: Current build version not found"
-                sleep 1
-                fn_print_info_nl "Checking for update: linux.mtasa.com: Forcing server restart"
-                fn_script_log_info "Checking for update: linux.mtasa.com: Forcing server restart"
-                exitbypass=1
-                command_stop.sh
-                exitbypass=1
-                command_start.sh
-                currentbuild=$(cat "${gamelogdir}"/server.log | grep "= Multi Theft Auto: San Andreas v" | awk '{ print $7 }'| sed -r 's/^.{1}//' | tail -1)
-                if [ -z "${currentbuild}" ]; then
-                        fn_print_fail_nl "Checking for update: linux.mtasa.com: Current build version still not found"
-                        fn_script_log_fatal "Checking for update: linux.mtasa.com: Current build version still not found"
-                        core_exit.sh
-                fi
-        fi
+	# Get current build from logs
+	currentbuild=$(cat "${gamelogdir}"/server.log | grep "= Multi Theft Auto: San Andreas v" | awk '{ print $7 }'| sed -r 's/^.{1}//' | tail -1)
+	if [ -z "${currentbuild}" ]; then
+		fn_print_error_nl "Checking for update: linux.mtasa.com: Current build version not found"
+		fn_script_log_error "Checking for update: linux.mtasa.com: Current build version not found"
+		sleep 1
+		fn_print_info_nl "Checking for update: linux.mtasa.com: Forcing server restart"
+		fn_script_log_info "Checking for update: linux.mtasa.com: Forcing server restart"
+		exitbypass=1
+		command_stop.sh
+		exitbypass=1
+		command_start.sh
+		currentbuild=$(cat "${gamelogdir}"/server.log | grep "= Multi Theft Auto: San Andreas v" | awk '{ print $7 }'| sed -r 's/^.{1}//' | tail -1)
+		if [ -z "${currentbuild}" ]; then
+			fn_print_fail_nl "Checking for update: linux.mtasa.com: Current build version still not found"
+			fn_script_log_fatal "Checking for update: linux.mtasa.com: Current build version still not found"
+			core_exit.sh
+		fi
+	fi
 }
 
 fn_mta_get_availablebuild(){
@@ -80,75 +80,75 @@ fn_mta_get_availablebuild(){
 }
 
 fn_update_mta_compare(){
-        # Removes dots so if can compare version numbers
-        currentbuilddigit=$(echo "${currentbuild}"|tr -cd '[:digit:]')
-        if [ "${currentbuilddigit}" -ne "${numversion}" ]||[ "${forceupdate}" == "1" ]; then
-                if [ "${forceupdate}" == "1" ]; then
-                        # forceupdate bypasses checks, useful for small build changes
-                        mta_update_string="forced"
-                else
-                        mta_update_string="available"
-                fi
-                echo -e "\n"
-                echo -e "Update ${mta_update_string}:"
-                sleep 1
-                echo -e "       Current build: ${red}${currentbuild} ${default}"
-                echo -e "       Available build: ${green}${fullversion} ${default}"
-                echo -e ""
-                sleep 1
-                echo ""
-                echo -en "Applying update.\r"
-                sleep 1
-                echo -en "Applying update..\r"
-                sleep 1
-                echo -en "Applying update...\r"
-                sleep 1
-                echo -en "\n"
-                fn_script_log "Update ${mta_update_string}"
-                fn_script_log "Current build: ${currentbuild}"
-                fn_script_log "Available build: ${fullversion}"
-                fn_script_log "${currentbuild} > ${fullversion}"
+	# Removes dots so if can compare version numbers
+	currentbuilddigit=$(echo "${currentbuild}"|tr -cd '[:digit:]')
+	if [ "${currentbuilddigit}" -ne "${numversion}" ]||[ "${forceupdate}" == "1" ]; then
+		if [ "${forceupdate}" == "1" ]; then
+			# forceupdate bypasses checks, useful for small build changes
+			mta_update_string="forced"
+		else
+			mta_update_string="available"
+		fi
+		echo -e "\n"
+		echo -e "Update ${mta_update_string}:"
+		sleep 1
+		echo -e "       Current build: ${red}${currentbuild} ${default}"
+		echo -e "       Available build: ${green}${fullversion} ${default}"
+		echo -e ""
+		sleep 1
+		echo ""
+		echo -en "Applying update.\r"
+		sleep 1
+		echo -en "Applying update..\r"
+		sleep 1
+		echo -en "Applying update...\r"
+		sleep 1
+		echo -en "\n"
+		fn_script_log "Update ${mta_update_string}"
+		fn_script_log "Current build: ${currentbuild}"
+		fn_script_log "Available build: ${fullversion}"
+		fn_script_log "${currentbuild} > ${fullversion}"
 
-                unset updateonstart
+		unset updateonstart
 
-                check_status.sh
-                if [ "${status}" == "0" ]; then
-                        fn_update_mta_dl
-                        exitbypass=1
-                        command_start.sh
-                        exitbypass=1
-                        command_stop.sh
-                else
-                        exitbypass=1
-                        command_stop.sh
-                        fn_update_mta_dl
-                        exitbypass=1
-                        command_start.sh
-                fi
-                alert="update"
-                alert.sh
-        else
-                echo -e "\n"
-                echo -e "No update available:"
-                echo -e "       Current version: ${green}${currentbuild}${default}"
-                echo -e "       Available version: ${green}${fullversion}${default}"
-                echo -e ""
-                fn_print_ok_nl "No update available"
-                fn_script_log_info "Current build: ${currentbuild}"
-                fn_script_log_info "Available build: ${fullversion}"
-        fi
+		check_status.sh
+		if [ "${status}" == "0" ]; then
+			fn_update_mta_dl
+			exitbypass=1
+			command_start.sh
+			exitbypass=1
+			command_stop.sh
+		else
+			exitbypass=1
+			command_stop.sh
+			fn_update_mta_dl
+			exitbypass=1
+			command_start.sh
+		fi
+		alert="update"
+		alert.sh
+	else
+		echo -e "\n"
+		echo -e "No update available:"
+		echo -e "       Current version: ${green}${currentbuild}${default}"
+		echo -e "       Available version: ${green}${fullversion}${default}"
+		echo -e ""
+		fn_print_ok_nl "No update available"
+		fn_script_log_info "Current build: ${currentbuild}"
+		fn_script_log_info "Available build: ${fullversion}"
+	fi
 }
 
 
 if [ "${installer}" == "1" ]; then
-        fn_mta_get_availablebuild
-        fn_update_mta_dl
+	fn_mta_get_availablebuild
+	fn_update_mta_dl
 else
-        # Checks for server update from linux.mtasa.com using the github repo.
-        fn_print_dots "Checking for update: linux.mtasa.com"
-        fn_script_log_info "Checking for update: linux.mtasa.com"
-        sleep 1
-        fn_update_mta_currentbuild
-        fn_mta_get_availablebuild
-        fn_update_mta_compare
+	# Checks for server update from linux.mtasa.com using the github repo.
+	fn_print_dots "Checking for update: linux.mtasa.com"
+	fn_script_log_info "Checking for update: linux.mtasa.com"
+	sleep 1
+	fn_update_mta_currentbuild
+	fn_mta_get_availablebuild
+	fn_update_mta_compare
 fi

From a33b33acbd39cadfa95c1f85d590f8dd4aae1f26 Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Fri, 28 Jul 2017 22:24:16 +0200
Subject: [PATCH 03/10] Corrected server files path variable

Fixes #1545
---
 lgsm/functions/update_mta.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lgsm/functions/update_mta.sh b/lgsm/functions/update_mta.sh
index b97b66807..35a4b23e2 100644
--- a/lgsm/functions/update_mta.sh
+++ b/lgsm/functions/update_mta.sh
@@ -12,9 +12,9 @@ fn_update_mta_dl(){
 	fn_fetch_file "http://linux.mtasa.com/dl/${numversion}/multitheftauto_linux_x64-${fullversion}.tar.gz" "${tmpdir}" "multitheftauto_linux_x64-${fullversion}.tar.gz"
 	mkdir "${tmpdir}/multitheftauto_linux_x64-${fullversion}"
 	fn_dl_extract "${tmpdir}" "multitheftauto_linux_x64-${fullversion}.tar.gz" "${tmpdir}/multitheftauto_linux_x64-${fullversion}"
-	echo -e "copying to ${filesdir}...\c"
-	fn_script_log "Copying to ${filesdir}"
-	cp -R "${tmpdir}/multitheftauto_linux_x64-${fullversion}/multitheftauto_linux_x64-${fullversion}/"* "${filesdir}"
+	echo -e "copying to ${serverfiles}...\c"
+	fn_script_log "Copying to ${serverfiles}"
+	cp -R "${tmpdir}/multitheftauto_linux_x64-${fullversion}/multitheftauto_linux_x64-${fullversion}/"* "${serverfiles}"
 	local exitcode=$?
 	if [ "${exitcode}" == "0" ]; then
 		fn_print_ok_eol_nl

From b5db85dce2d33dcc5552330c5cbf231f3a8b4a11 Mon Sep 17 00:00:00 2001
From: SharkyKZ <sharkykz@gmail.com>
Date: Thu, 3 Aug 2017 09:26:35 +0300
Subject: [PATCH 04/10] Syntax error in UT3 default config

Duplicate quote in UT3 default config caused server install to fail. Can be merged on code review.
---
 lgsm/config-default/config-lgsm/ut3server/_default.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/ut3server/_default.cfg b/lgsm/config-default/config-lgsm/ut3server/_default.cfg
index 31c63b300..6b7b5c254 100644
--- a/lgsm/config-default/config-lgsm/ut3server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ut3server/_default.cfg
@@ -26,7 +26,7 @@ allowjoininprogress="true"
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 # Edit with care | List of game types and mutators : http://wiki.unrealadmin.org/FAQ:UT3
 fn_parms(){
-parms="server ${defaultmap}?Game=${game}?bIsDedicated=${isdedicated}?bIsLanMatch=${islanmatch}?bUsesStats=${usesstats}?bShouldAdvertise=${shouldadvertise}?PureServer=${pureserver}?bAllowJoinInProgress=${allowjoininprogress}?MaxPlayers=${maxplayers}?Mutator=${mutators} -port=${port} -queryport=${queryport} -multihome=${ip} -nohomedir -unattended -log=${gamelog} -ini=${servercfgfullpath}""
+parms="server ${defaultmap}?Game=${game}?bIsDedicated=${isdedicated}?bIsLanMatch=${islanmatch}?bUsesStats=${usesstats}?bShouldAdvertise=${shouldadvertise}?PureServer=${pureserver}?bAllowJoinInProgress=${allowjoininprogress}?MaxPlayers=${maxplayers}?Mutator=${mutators} -port=${port} -queryport=${queryport} -multihome=${ip} -nohomedir -unattended -log=${gamelog} -ini=${servercfgfullpath}"
 }
 
 #### LinuxGSM Settings ####
@@ -88,4 +88,4 @@ emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
-gamelogdate="${gamelogdir}/${servicename}-game-$(date '+%Y-%m-%d-%H:%M:%S').log"
\ No newline at end of file
+gamelogdate="${gamelogdir}/${servicename}-game-$(date '+%Y-%m-%d-%H:%M:%S').log"

From 98fac37b29f65596c33d546119306dd6db64dc82 Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Fri, 4 Aug 2017 01:09:05 +0200
Subject: [PATCH 05/10] Changed scriptlogdir to lgsmlogdir

---
 lgsm/config-default/config-lgsm/bb2server/_default.cfg    | 2 +-
 lgsm/config-default/config-lgsm/bf1942server/_default.cfg | 2 +-
 lgsm/config-default/config-lgsm/bmdmserver/_default.cfg   | 2 +-
 lgsm/config-default/config-lgsm/boserver/_default.cfg     | 2 +-
 lgsm/config-default/config-lgsm/bsserver/_default.cfg     | 2 +-
 lgsm/config-default/config-lgsm/ccserver/_default.cfg     | 2 +-
 lgsm/config-default/config-lgsm/cod2server/_default.cfg   | 2 +-
 lgsm/config-default/config-lgsm/cod4server/_default.cfg   | 2 +-
 lgsm/config-default/config-lgsm/codserver/_default.cfg    | 2 +-
 lgsm/config-default/config-lgsm/coduoserver/_default.cfg  | 2 +-
 lgsm/config-default/config-lgsm/codwawserver/_default.cfg | 2 +-
 lgsm/config-default/config-lgsm/coserver/_default.cfg     | 2 +-
 lgsm/config-default/config-lgsm/csserver/_default.cfg     | 2 +-
 lgsm/config-default/config-lgsm/doiserver/_default.cfg    | 1 -
 14 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/bb2server/_default.cfg b/lgsm/config-default/config-lgsm/bb2server/_default.cfg
index 148e261c9..ef0979184 100644
--- a/lgsm/config-default/config-lgsm/bb2server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/bb2server/_default.cfg
@@ -95,5 +95,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
\ No newline at end of file
diff --git a/lgsm/config-default/config-lgsm/bf1942server/_default.cfg b/lgsm/config-default/config-lgsm/bf1942server/_default.cfg
index 1ed6d40e2..4ac85ad1e 100644
--- a/lgsm/config-default/config-lgsm/bf1942server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/bf1942server/_default.cfg
@@ -74,5 +74,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
\ No newline at end of file
diff --git a/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg b/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg
index 8b0115281..a752fb2bc 100644
--- a/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg
@@ -95,5 +95,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
\ No newline at end of file
diff --git a/lgsm/config-default/config-lgsm/boserver/_default.cfg b/lgsm/config-default/config-lgsm/boserver/_default.cfg
index d08358669..3e31ad4c1 100644
--- a/lgsm/config-default/config-lgsm/boserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/boserver/_default.cfg
@@ -85,5 +85,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
\ No newline at end of file
diff --git a/lgsm/config-default/config-lgsm/bsserver/_default.cfg b/lgsm/config-default/config-lgsm/bsserver/_default.cfg
index 0dc2fafd7..bb5eafc07 100644
--- a/lgsm/config-default/config-lgsm/bsserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/bsserver/_default.cfg
@@ -94,5 +94,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
\ No newline at end of file
diff --git a/lgsm/config-default/config-lgsm/ccserver/_default.cfg b/lgsm/config-default/config-lgsm/ccserver/_default.cfg
index 8293759d4..625543ec4 100644
--- a/lgsm/config-default/config-lgsm/ccserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ccserver/_default.cfg
@@ -90,5 +90,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
\ No newline at end of file
diff --git a/lgsm/config-default/config-lgsm/cod2server/_default.cfg b/lgsm/config-default/config-lgsm/cod2server/_default.cfg
index b9a083c06..8dd0879c4 100644
--- a/lgsm/config-default/config-lgsm/cod2server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/cod2server/_default.cfg
@@ -74,5 +74,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
\ No newline at end of file
diff --git a/lgsm/config-default/config-lgsm/cod4server/_default.cfg b/lgsm/config-default/config-lgsm/cod4server/_default.cfg
index 7da88f5b0..4fb612357 100644
--- a/lgsm/config-default/config-lgsm/cod4server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/cod4server/_default.cfg
@@ -74,5 +74,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
\ No newline at end of file
diff --git a/lgsm/config-default/config-lgsm/codserver/_default.cfg b/lgsm/config-default/config-lgsm/codserver/_default.cfg
index a816d6497..04f535a2f 100644
--- a/lgsm/config-default/config-lgsm/codserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/codserver/_default.cfg
@@ -74,5 +74,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
\ No newline at end of file
diff --git a/lgsm/config-default/config-lgsm/coduoserver/_default.cfg b/lgsm/config-default/config-lgsm/coduoserver/_default.cfg
index 2d2036114..29b7a8d3a 100644
--- a/lgsm/config-default/config-lgsm/coduoserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/coduoserver/_default.cfg
@@ -74,5 +74,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
\ No newline at end of file
diff --git a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg
index d78b890e9..02b65e70d 100644
--- a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg
@@ -74,5 +74,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
\ No newline at end of file
diff --git a/lgsm/config-default/config-lgsm/coserver/_default.cfg b/lgsm/config-default/config-lgsm/coserver/_default.cfg
index 414f7683f..7ffcb8a1a 100644
--- a/lgsm/config-default/config-lgsm/coserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/coserver/_default.cfg
@@ -118,5 +118,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
\ No newline at end of file
diff --git a/lgsm/config-default/config-lgsm/csserver/_default.cfg b/lgsm/config-default/config-lgsm/csserver/_default.cfg
index 4b46221d8..24270c7df 100644
--- a/lgsm/config-default/config-lgsm/csserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/csserver/_default.cfg
@@ -87,5 +87,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
\ No newline at end of file
diff --git a/lgsm/config-default/config-lgsm/doiserver/_default.cfg b/lgsm/config-default/config-lgsm/doiserver/_default.cfg
index c58a526bd..984b90552 100644
--- a/lgsm/config-default/config-lgsm/doiserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/doiserver/_default.cfg
@@ -82,7 +82,6 @@ backupdir="${rootdir}/backups"
 ## Logging Directories
 logdir="${rootdir}/log"
 gamelogdir="${systemdir}/logs"
-scriptlogdir="${logdir}/script"
 consolelogdir="${logdir}/console"
 lgsmlog="${lgsmlogdir}/${servicename}-script.log"
 consolelog="${consolelogdir}/${servicename}-console.log"

From 521c30e58e224565943acb553aec67a929b5e1af Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Fri, 4 Aug 2017 02:06:32 +0200
Subject: [PATCH 06/10] Removed duplicated scriptlogdir legacy entry

---
 lgsm/functions/core_legacy.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lgsm/functions/core_legacy.sh b/lgsm/functions/core_legacy.sh
index 44e271a4d..105659510 100644
--- a/lgsm/functions/core_legacy.sh
+++ b/lgsm/functions/core_legacy.sh
@@ -21,10 +21,6 @@ if [ -z "${lgsmlog}" ]; then
 	lgsmlog="${scriptlog}"
 fi
 
-if [ -z "${lgsmlogdir}" ]; then
-	lgsmlogdir="${scriptlogdir}"
-fi
-
 if [ -z "${lgsmlogdate}" ]; then
 	lgsmlogdate="${scriptlogdate}"
 fi

From da9cd256d54babf9a7f29c497b9b2458a636591b Mon Sep 17 00:00:00 2001
From: Tobias Hoos <tobias_hoos@web.de>
Date: Mon, 14 Aug 2017 18:59:00 +0200
Subject: [PATCH 07/10] set maxplayers in default for CoD

---
 lgsm/config-default/config-lgsm/cod2server/_default.cfg   | 2 +-
 lgsm/config-default/config-lgsm/cod4server/_default.cfg   | 2 +-
 lgsm/config-default/config-lgsm/codserver/_default.cfg    | 2 +-
 lgsm/config-default/config-lgsm/codwawserver/_default.cfg | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/cod2server/_default.cfg b/lgsm/config-default/config-lgsm/cod2server/_default.cfg
index b9a083c06..e76692042 100644
--- a/lgsm/config-default/config-lgsm/cod2server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/cod2server/_default.cfg
@@ -16,7 +16,7 @@ maxplayers="20"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
diff --git a/lgsm/config-default/config-lgsm/cod4server/_default.cfg b/lgsm/config-default/config-lgsm/cod4server/_default.cfg
index 7da88f5b0..a10d360e6 100644
--- a/lgsm/config-default/config-lgsm/cod4server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/cod4server/_default.cfg
@@ -16,7 +16,7 @@ maxplayers="32"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
diff --git a/lgsm/config-default/config-lgsm/codserver/_default.cfg b/lgsm/config-default/config-lgsm/codserver/_default.cfg
index a816d6497..4e160d887 100644
--- a/lgsm/config-default/config-lgsm/codserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/codserver/_default.cfg
@@ -16,7 +16,7 @@ maxplayers="20"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
diff --git a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg
index d78b890e9..4f19a13cc 100644
--- a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg
@@ -16,7 +16,7 @@ maxplayers="20"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####

From 43496b4453e679760e4bbf440f2941eb2433d759 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 19 Aug 2017 21:08:01 +0100
Subject: [PATCH 08/10] Revert "set maxplayers in default for CoD"

---
 lgsm/config-default/config-lgsm/cod2server/_default.cfg   | 2 +-
 lgsm/config-default/config-lgsm/cod4server/_default.cfg   | 2 +-
 lgsm/config-default/config-lgsm/codserver/_default.cfg    | 2 +-
 lgsm/config-default/config-lgsm/codwawserver/_default.cfg | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/cod2server/_default.cfg b/lgsm/config-default/config-lgsm/cod2server/_default.cfg
index e76692042..b9a083c06 100644
--- a/lgsm/config-default/config-lgsm/cod2server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/cod2server/_default.cfg
@@ -16,7 +16,7 @@ maxplayers="20"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
diff --git a/lgsm/config-default/config-lgsm/cod4server/_default.cfg b/lgsm/config-default/config-lgsm/cod4server/_default.cfg
index a10d360e6..7da88f5b0 100644
--- a/lgsm/config-default/config-lgsm/cod4server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/cod4server/_default.cfg
@@ -16,7 +16,7 @@ maxplayers="32"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
diff --git a/lgsm/config-default/config-lgsm/codserver/_default.cfg b/lgsm/config-default/config-lgsm/codserver/_default.cfg
index 4e160d887..a816d6497 100644
--- a/lgsm/config-default/config-lgsm/codserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/codserver/_default.cfg
@@ -16,7 +16,7 @@ maxplayers="20"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
diff --git a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg
index 4f19a13cc..d78b890e9 100644
--- a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg
@@ -16,7 +16,7 @@ maxplayers="20"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####

From d07c34bbb2b279e45a87dac95b8c78323cae7f47 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 19 Aug 2017 21:07:55 +0100
Subject: [PATCH 09/10] Merge pull request #1573 from
 Lebawurscht/fix/maxplayersCoD

set maxplayers in default for CoD
---
 lgsm/config-default/config-lgsm/cod2server/_default.cfg   | 2 +-
 lgsm/config-default/config-lgsm/cod4server/_default.cfg   | 2 +-
 lgsm/config-default/config-lgsm/codserver/_default.cfg    | 2 +-
 lgsm/config-default/config-lgsm/codwawserver/_default.cfg | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/cod2server/_default.cfg b/lgsm/config-default/config-lgsm/cod2server/_default.cfg
index b9a083c06..e76692042 100644
--- a/lgsm/config-default/config-lgsm/cod2server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/cod2server/_default.cfg
@@ -16,7 +16,7 @@ maxplayers="20"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
diff --git a/lgsm/config-default/config-lgsm/cod4server/_default.cfg b/lgsm/config-default/config-lgsm/cod4server/_default.cfg
index 7da88f5b0..a10d360e6 100644
--- a/lgsm/config-default/config-lgsm/cod4server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/cod4server/_default.cfg
@@ -16,7 +16,7 @@ maxplayers="32"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
diff --git a/lgsm/config-default/config-lgsm/codserver/_default.cfg b/lgsm/config-default/config-lgsm/codserver/_default.cfg
index a816d6497..4e160d887 100644
--- a/lgsm/config-default/config-lgsm/codserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/codserver/_default.cfg
@@ -16,7 +16,7 @@ maxplayers="20"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
diff --git a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg
index d78b890e9..4f19a13cc 100644
--- a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg
@@ -16,7 +16,7 @@ maxplayers="20"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####

From fd835e995a47c59db28bc7184e9d24fe13aa3aee Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 19 Aug 2017 21:11:28 +0100
Subject: [PATCH 10/10] Merge pull request #1547 from pedrozun/master

Added Barren map Wipe support for RustServers
---
 lgsm/functions/command_wipe.sh | 44 ++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/lgsm/functions/command_wipe.sh b/lgsm/functions/command_wipe.sh
index 27ccfbf2f..c20634983 100644
--- a/lgsm/functions/command_wipe.sh
+++ b/lgsm/functions/command_wipe.sh
@@ -43,9 +43,10 @@ fn_wipe_exit_code(){
 # Removes files to wipe server
 fn_wipe_server_remove_files(){
 	# Rust Wipe
+#WipeProceduralSave
 	if [ "${gamename}" == "Rust" ]; then
 		if [ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap.*.sav")" ]; then
-			currentaction="Removing map save(s): ${serveridentitydir}/proceduralmap.*.sav"
+			currentaction="Removing procedural map save(s): ${serveridentitydir}/proceduralmap.*.sav"
 			echo -en "Removing map saves proceduralmap.*.sav file(s)..."
 			sleep 1
 			fn_script_log "${currentaction}"
@@ -53,21 +54,50 @@ fn_wipe_server_remove_files(){
 			fn_wipe_exit_code
 			sleep 0.5
 		else
-			fn_print_information_nl "No map save to remove"
-			fn_script_log_info "No map save to remove."
+			fn_print_information_nl "No procedural map save to remove"
+			fn_script_log_info "No procedural map save to remove."
 			sleep 0.5
 		fi
+#WipeBarrenSave
+			if [ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]; then
+			currentaction="Removing barren map save(s): ${serveridentitydir}/barren*.sav"
+			echo -en "Removing barren map saves barren*.sav file(s)..."
+			sleep 1
+			fn_script_log "${currentaction}"
+			find "${serveridentitydir:?}" -type f -name "barren*.sav" -delete
+			fn_wipe_exit_code
+			sleep 0.5
+		else
+			fn_print_information_nl "No barren map save to remove"
+			fn_script_log_info "No barren map save to remove."
+			sleep 0.5
+		fi
+#WipeProceduralMap
 		if [ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap.*.map")" ]; then
 			currentaction="Removing map file(s): ${serveridentitydir}/proceduralmap.*.map"
-			echo -en "Removing map proceduralmap.*.map file(s)..."
+			echo -en "Removing procedural map proceduralmap.*.map file(s)..."
 			sleep 1
 			fn_script_log "${currentaction}"
 			find "${serveridentitydir:?}" -type f -name "proceduralmap.*.map" -delete
 			fn_wipe_exit_code
 			sleep 0.5
 		else
-			fn_print_information_nl "No map file to remove"
-			fn_script_log_info "No map file to remove."
+			fn_print_information_nl "No procedural map file to remove"
+			fn_script_log_info "No procedural map file to remove."
+			sleep 0.5
+		fi
+#WipeBarrenMap
+				if [ -n "$(find "${serveridentitydir}" -type f -name "barren*.map")" ]; then
+			currentaction="Removing map file(s): ${serveridentitydir}/barren*.map"
+			echo -en "Removing barren map barren*.map file(s)..."
+			sleep 1
+			fn_script_log "${currentaction}"
+			find "${serveridentitydir:?}" -type f -name "barren*.map" -delete
+			fn_wipe_exit_code
+			sleep 0.5
+		else
+			fn_print_information_nl "No barren map file to remove"
+			fn_script_log_info "No barren map file to remove."
 			sleep 0.5
 		fi
 		if [ -d "${serveridentitydir}/user" ]; then
@@ -116,7 +146,7 @@ fn_wipe_server_remove_files(){
 # Check if there is something to wipe, prompt the user, and call appropriate functions
 # Rust Wipe
 if [ "${gamename}" == "Rust" ]; then
-	if [ -d "${serveridentitydir}/storage" ]||[ -d "${serveridentitydir}/user" ]||[ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "Log.*.txt")" ]; then
+	if [ -d "${serveridentitydir}/storage" ]||[ -d "${serveridentitydir}/user" ]||[ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "Log.*.txt")" ]; then
 		fn_print_warning_nl "Any user, storage, log and map data from ${serveridentitydir} will be erased."
 		if ! fn_prompt_yn "Continue?" Y; then
 				echo Exiting; core_exit.sh