diff --git a/lgsm/config-default/config-lgsm/vhserver/_default.cfg b/lgsm/config-default/config-lgsm/vhserver/_default.cfg index d6e839c37..c6f8b8726 100644 --- a/lgsm/config-default/config-lgsm/vhserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/vhserver/_default.cfg @@ -10,13 +10,14 @@ ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters servername="Valheim Server" +# Minimum password length is 5. serverpassword="" port="2456" gameworld="${selfname}" public="1" ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters -startparameters="-name ${servername} -password ${serverpassword} -port ${port} -world ${gameworld} -public ${public}" +startparameters="-name '${servername}' -password ${serverpassword} -port ${port} -world ${gameworld} -public ${public}" #### LinuxGSM Settings #### @@ -138,8 +139,8 @@ stopmode="2" # 3: gamedig # 4: gsquery # 5: tcp -querymode="1" -querytype="" +querymode="2" +querytype="protocol-valve" ## Console type consoleverbose="yes" diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh index a8e9dc03c..c2e17116c 100755 --- a/lgsm/functions/core_functions.sh +++ b/lgsm/functions/core_functions.sh @@ -8,7 +8,7 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" -modulesversion="v21.1.2" +modulesversion="v21.1.3" # Core diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 90aba09dc..610952a03 100755 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -1259,9 +1259,9 @@ fn_info_message_unreal(){ fi if [ "${appid}" ]; then if [ "${appid}" == "223250" ]; then - echo -e "< Steam\tINBOUND\t20610\tudp" + echo -e "> Steam\tINBOUND\t20610\tudp" else - echo -e "< Steam\tINBOUND\t20660\tudp" + echo -e "> Steam\tINBOUND\t20660\tudp" fi fi echo -e "> Web Admin\tINBOUND\t${webadminport}\ttcp\tListenPort=${webadminport}" @@ -1347,6 +1347,7 @@ fn_info_message_vh(){ { echo -e "${lightblue}DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL${default}" echo -e "> Game\tINBOUND\t${port}\tudp" + echo -e "> Query\tINBOUND\t${queryport}\tudp" } | column -s $'\t' -t } diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh index 7644b03a7..f5533717f 100755 --- a/lgsm/functions/info_parms.sh +++ b/lgsm/functions/info_parms.sh @@ -235,6 +235,14 @@ fn_info_parms_ut(){ port=${port:-"0"} } +fn_info_parms_vh(){ + port=${port:-"0"} + queryport=$((port + 1)) + gameworld=${gameworld:-"NOT SET"} + serverpassword=${serverpassword:-"NOT SET"} + servername=${servername:-"NOT SET"} +} + fn_info_parms_wf(){ port=${port:-"0"} queryport="${port:-"0"}" @@ -293,6 +301,8 @@ elif [ "${shortname}" == "tu" ]; then fn_info_parms_towerunite elif [ "${shortname}" == "tw" ]; then fn_info_parms_teeworlds +elif [ "${shortname}" == "vh" ]; then + fn_info_parms_vh elif [ "${shortname}" == "mh" ]; then fn_info_parms_mordhau elif [ "${shortname}" == "mta" ]; then diff --git a/linuxgsm.sh b/linuxgsm.sh index 2089e3866..e22fa3ea4 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v21.1.2" +version="v21.1.3" shortname="core" gameservername="core" commandname="CORE" @@ -452,7 +452,6 @@ else eval preexecutable="$(sed -nr 's/^ *preexecutable=(.*)$/\1/p' "${configdirserver}/_default.cfg")" fi eval startparameters="$(sed -nr 's/^ *startparameters=(.*)$/\1/p' "${configdirserver}/_default.cfg")" - eval executable="$(sed -nr 's/^ *executable=(.*)$/\1/p' "${configdirserver}/_default.cfg")" fi # Load the linuxgsm.sh in to tmpdir. If missing download it. diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh index f522e2c84..46d285e8c 100644 --- a/tests/tests_fctrserver.sh +++ b/tests/tests_fctrserver.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v21.1.2" +version="v21.1.3" shortname="fctr" gameservername="fctrserver" commandname="CORE" diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 24d3190cd..1e500759f 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v21.1.2" +version="v21.1.3" shortname="jc2" gameservername="jc2server" commandname="CORE" diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh index 054693173..7bd70baf8 100644 --- a/tests/tests_mcserver.sh +++ b/tests/tests_mcserver.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v21.1.2" +version="v21.1.3" shortname="mc" gameservername="mcserver" commandname="CORE" diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh index abbf6d737..394186c65 100644 --- a/tests/tests_ts3server.sh +++ b/tests/tests_ts3server.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v21.1.2" +version="v21.1.3" shortname="ts3" gameservername="ts3server" commandname="CORE"