From 9e77aa6b87ac122a3f752997db33e6ad59aafac9 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 23 Jan 2021 23:23:10 +0000
Subject: [PATCH] add preexecutable to eval

---
 lgsm/config-default/config-lgsm/mcserver/_default.cfg   | 2 +-
 lgsm/config-default/config-lgsm/rwserver/_default.cfg   | 2 +-
 lgsm/config-default/config-lgsm/wurmserver/_default.cfg | 2 +-
 lgsm/functions/command_debug.sh                         | 4 ++--
 lgsm/functions/command_start.sh                         | 4 ++--
 lgsm/functions/info_messages.sh                         | 2 +-
 linuxgsm.sh                                             | 6 +++++-
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/mcserver/_default.cfg b/lgsm/config-default/config-lgsm/mcserver/_default.cfg
index 3068dfeef..b2b053490 100644
--- a/lgsm/config-default/config-lgsm/mcserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/mcserver/_default.cfg
@@ -149,7 +149,7 @@ glibc="null"
 ## Game Server Directories
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
-prexecutable="java -Xmx${javaram}M -jar"
+preexecutable="java -Xmx${javaram}M -jar"
 executable="./minecraft_server.jar"
 servercfgdir="${systemdir}"
 servercfg="server.properties"
diff --git a/lgsm/config-default/config-lgsm/rwserver/_default.cfg b/lgsm/config-default/config-lgsm/rwserver/_default.cfg
index fc9253afe..98b79596f 100644
--- a/lgsm/config-default/config-lgsm/rwserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/rwserver/_default.cfg
@@ -153,7 +153,7 @@ glibc="null"
 ## Game Server Directories
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
-prexecutable="java -Xmx${javaram}M -jar"
+preexecutable="java -Xmx${javaram}M -jar"
 executable="./server.jar"
 servercfgdir="${systemdir}"
 servercfg="server.properties"
diff --git a/lgsm/config-default/config-lgsm/wurmserver/_default.cfg b/lgsm/config-default/config-lgsm/wurmserver/_default.cfg
index 23184682b..5d5ba9790 100644
--- a/lgsm/config-default/config-lgsm/wurmserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/wurmserver/_default.cfg
@@ -148,7 +148,7 @@ glibc="2.14"
 ## Game Server Directories
 systemdir="${serverfiles}"
 executabledir="${systemdir}"
-prexecutable="xvfb-run"
+preexecutable="xvfb-run"
 executable="./WurmServerLauncher"
 servercfgdir="${systemdir}"
 servercfg="${selfname}.cfg"
diff --git a/lgsm/functions/command_debug.sh b/lgsm/functions/command_debug.sh
index 31afd65c9..7decf7705 100755
--- a/lgsm/functions/command_debug.sh
+++ b/lgsm/functions/command_debug.sh
@@ -73,7 +73,7 @@ if [ "${engine}" == "source" ]||[ "${engine}" == "goldsrc" ]; then
 elif [ "${engine}" == "quake" ]; then
 	echo -e "${executable} ${parms} -condebug"
 else
-	echo -e "${prexecutable} ${executable} ${parms}"
+	echo -e "${preexecutable} ${executable} ${parms}"
 fi
 echo -e ""
 echo -e "Use for identifying server issues only!"
@@ -114,7 +114,7 @@ elif [ "${shortname}" == "arma3" ]; then
 elif [ "${engine}" == "quake" ]; then
 	${executable} ${parms} -condebug
 else
-	${prexecutable} ${executable} ${parms}
+	${preexecutable} ${executable} ${parms}
 fi
 
 fn_lockfile_trap
diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh
index 3f4f3b8d7..f349ec6a1 100755
--- a/lgsm/functions/command_start.sh
+++ b/lgsm/functions/command_start.sh
@@ -74,7 +74,7 @@ fn_start_tmux(){
 	echo "${version}" >> "${lockdir}/${selfname}.lock"
 	echo "${port}" >> "${lockdir}/${selfname}.lock"
 	cd "${executabledir}" || exit
-	tmux new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${sessionname}" "${prexecutable} ${executable} ${parms}" 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp"
+	tmux new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${sessionname}" "${preexecutable} ${executable} ${parms}" 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp"
 
 	# Create logfile.
 	touch "${consolelog}"
@@ -132,7 +132,7 @@ fn_start_tmux(){
 			echo -e ""
 			echo -e "Command"
 			echo -e "================================="
-			echo -e "tmux new-session -d -s \"${sessionname}\" \"${prexecutable} ${executable} ${parms}\"" | tee -a "${lgsmlog}"
+			echo -e "tmux new-session -d -s \"${sessionname}\" \"${preexecutable} ${executable} ${parms}\"" | tee -a "${lgsmlog}"
 			echo -e ""
 			echo -e "Error"
 			echo -e "================================="
diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh
index a72d141fa..3f5601a68 100755
--- a/lgsm/functions/info_messages.sh
+++ b/lgsm/functions/info_messages.sh
@@ -556,7 +556,7 @@ fn_info_message_commandlineparms(){
 		unset serverpassword
 	fi
 	fn_parms
-	echo -e "${prexecutable} ${executable} ${parms}"
+	echo -e "${preexecutable} ${executable} ${parms}"
 }
 
 fn_info_message_ports(){
diff --git a/linuxgsm.sh b/linuxgsm.sh
index 99d3ad306..83f457c05 100644
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -387,7 +387,7 @@ else
 			else
 				echo -e "OK"
 			fi
-		fi	
+		fi
 	else
 		function_file_diff=$(diff -q "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg")
 		if [ "${function_file_diff}" != "" ]; then
@@ -448,6 +448,10 @@ else
 			# shellcheck source=/dev/null
 			source "${servercfgfullpath}"
 		fi
+
+		if [ -n "${preexecutable}" ]; then
+			eval preexecutable="$(grep -w preexecutable= "${configdirserver}/_default.cfg" | sed -e 's/preexecutable=//g')"
+		fi
 		eval startparameters="$(grep -w startparameters= "${configdirserver}/_default.cfg" | sed -e 's/startparameters=//g')"
 		eval executable="$(grep -w executable= "${configdirserver}/_default.cfg" | sed -e 's/executable=//g')"
 	fi