From 469eb693dd3d1db1bdf68934cdd2668335afa527 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 31 Dec 2020 16:26:54 +0000
Subject: [PATCH] solution using eval

---
 linuxgsm.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/linuxgsm.sh b/linuxgsm.sh
index 49b81c6a6..3ab215787 100644
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -440,10 +440,12 @@ else
 				# shellcheck source=/dev/null
 				source "${configdirserver}/secrets-${selfname}.cfg"
 			fi
-			if [ ! "$(grep startparameters "${configdirserver}/common.cfg")" ]||[ ! "$(grep startparameters "${configdirserver}/${selfname}.cfg")" ]; then
-				startparameters2="$(grep startparameters= "${configdirserver}/_default.cfg" | sed -e 's/startparameters=//g')"
-				startparameters=startparameters2
+			if [ -n "$(grep startparameters "${configdirserver}/common.cfg" | sed -e '/^#/d')" ]||[ -n "$(grep startparameters "${configdirserver}/${selfname}.cfg" | sed -e '/^#/d')" ]||[ -n "$(grep startparameters "${configdirserver}/secrets-common.cfg" | sed -e '/^#/d')" ]||[ -n "$(grep startparameters "${configdirserver}/secrets-${selfname}.cfg" | sed -e '/^#/d')" ]; then
+				:
+			else
+				eval startparameters="$(grep startparameters= "${configdirserver}/_default.cfg" | sed -e 's/startparameters=//g')"
 			fi
+
 			# Load the linuxgsm.sh in to tmpdir. If missing download it.
 			if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then
 				fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nomd5"