From 1df5f0bbbd2acb4eefe0c12ce9a95e65d1d1f83f Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Mon, 15 Mar 2021 14:31:51 +0000
Subject: [PATCH 1/3] fix(start): revert commit removing quotes from tmux

This reverts commit 3d396049a650069fa332611b92148618c610451c.

This commit broke start parameters
---
 lgsm/functions/command_start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh
index b65e8d260..e06a0e3e5 100755
--- a/lgsm/functions/command_start.sh
+++ b/lgsm/functions/command_start.sh
@@ -72,7 +72,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}" ${preexecutable} ${executable} ${startparameters} 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp"
+	tmux new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${sessionname}" "${preexecutable} ${executable} ${startparameters}" 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp"
 
 	# Create logfile.
 	touch "${consolelog}"

From 641109750a2bdbcaac6c12ce6c4837c7ebc3ec91 Mon Sep 17 00:00:00 2001
From: Christian <h3o66@users.noreply.github.com>
Date: Mon, 15 Mar 2021 20:43:48 +0100
Subject: [PATCH 2/3] fix(valheim): disable queryport if public is set to 0
 (#3374)

---
 lgsm/functions/info_parms.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh
index f5533717f..f2496ce5d 100755
--- a/lgsm/functions/info_parms.sh
+++ b/lgsm/functions/info_parms.sh
@@ -237,7 +237,11 @@ fn_info_parms_ut(){
 
 fn_info_parms_vh(){
 	port=${port:-"0"}
-	queryport=$((port + 1))
+	if [ "${public}" != "0" ]; then
+		queryport=$((port + 1))
+	else
+		querymode="1"
+	fi
 	gameworld=${gameworld:-"NOT SET"}
 	serverpassword=${serverpassword:-"NOT SET"}
 	servername=${servername:-"NOT SET"}

From 23f6c9a35ca8e194dc7ae5dc1a73c03a6c04c4ad Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Mon, 15 Mar 2021 20:02:33 +0000
Subject: [PATCH 3/3] fix(config): parms setting will work again if present in
 configs (#3381)

* fix(config): parms setting will work again if present in configs

This will allow the legacy "parms" to still function
---
 linuxgsm.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/linuxgsm.sh b/linuxgsm.sh
index 0182d24db..86957eb39 100755
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -465,7 +465,25 @@ else
 		elif grep -qE "^[[:blank:]]*startparameters=" "${configdirserver}/_default.cfg"; then
 			eval startparameters="$(sed -nr 's/^ *startparameters=(.*)$/\1/p' "${configdirserver}/_default.cfg")"
 		fi
+
+		# For legacy configs that still use parms= 15.03.21
+		if grep -qE "^[[:blank:]]*parms=" "${configdirserver}/secrets-${selfname}.cfg"; then
+			eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/secrets-${selfname}.cfg")"
+		elif grep -qE "^[[:blank:]]*parms=" "${configdirserver}/${selfname}.cfg"; then
+			eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/${selfname}.cfg")"
+		elif grep -qE "^[[:blank:]]*parms=" "${configdirserver}/secrets-common.cfg"; then
+			eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/secrets-common.cfg")"
+		elif grep -qE "^[[:blank:]]*parms=" "${configdirserver}/common.cfg"; then
+			eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/common.cfg")"
+		elif grep -qE "^[[:blank:]]*parms=" "${configdirserver}/_default.cfg"; then
+			eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/_default.cfg")"
+		fi
+
+		if [ -n "${parms}" ]; then
+			startparameters="${parms}"
+		fi
 	}
+
 	fn_reload_startparameters
 	# Load the linuxgsm.sh in to tmpdir. If missing download it.
 	if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then