From f1d3db41dbcb8ef3d1101049d89a4bd1a0256eff Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 5 Jan 2021 23:38:51 +0000 Subject: [PATCH] grep w --- linuxgsm.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/linuxgsm.sh b/linuxgsm.sh index fc54d443f..ca3bfc746 100644 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -443,8 +443,12 @@ else 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')" - eval executable="$(grep executable= "${configdirserver}/_default.cfg" | sed -e 's/executable=//g')" + if [ "${shortname}" == "wurm" ]; then + # shellcheck source=/dev/null + source "${servercfgfullpath}" + 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 # Load the linuxgsm.sh in to tmpdir. If missing download it.