From 2d2d8941c33f872994ad29631ae865a772494584 Mon Sep 17 00:00:00 2001 From: cedarlug Date: Sat, 11 Jun 2016 21:26:28 -0500 Subject: [PATCH 1/3] Adding in parsing for realvirtual engine - allows arma3server to find its parameters --- lgsm/functions/info_parms.sh | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh index df70e14f7..e0b63e585 100644 --- a/lgsm/functions/info_parms.sh +++ b/lgsm/functions/info_parms.sh @@ -28,8 +28,14 @@ fn_info_config_idtech3(){ } fn_info_config_realvirtuality(){ + port=$(grep "^serverport=" "${servercfgfullpath}" | tr -cd '[:digit:]') + queryport=$(grep "^steamqueryport=" "${servercfgfullpath}" | tr -cd '[:digit:]') + masterport=$(grep "^steamport=" "${servercfgfullpath}" | tr -cd '[:digit:]') + # Not Set - port=${rconport:-"0"} + port=${port:-"2302"} + queryport=${queryport:-"2303"} + masterport=${masterport:-"2304"} } fn_info_config_source(){ @@ -70,29 +76,29 @@ fn_info_config_teeworlds(){ rconpassword="${unavailable}" port="8303" slots="12" - else + else servername=$(grep "sv_name" "${servercfgfullpath}" | sed 's/sv_name //g' | sed 's/"//g') serverpassword=$(grep "password " "${servercfgfullpath}" | awk '!/sv_rcon_password/'| sed 's/password //g' | tr -d '=\"; ') rconpassword=$(grep "sv_rcon_password" "${servercfgfullpath}" | sed 's/sv_rcon_password //g' | tr -d '=\"; ') port=$(grep "sv_port" "${servercfgfullpath}" | tr -cd '[:digit:]') slots=$(grep "sv_max_clients" "${servercfgfullpath}" | tr -cd '[:digit:]') - + # Not Set servername=${servername:-"NOT SET"} serverpassword=${serverpassword:-"NOT SET"} rconpassword=${rconpassword:-"NOT SET"} port=${port:-"8303"} slots=${slots:-"12"} - fi + fi } fn_info_config_terraria(){ if [ ! -f "${servercfgfullpath}" ]; then port="0" - else + else port=$(grep "port=" "${servercfgfullpath}" | tr -cd '[:digit:]') - # Not Set + # Not Set port=${port:-"0"} fi } @@ -134,7 +140,7 @@ fn_info_config_unreal(){ webadminport=${webadminport:-"NOT SET"} webadminuser=${webadminuser:-"NOT SET"} webadminpass=${webadminpass:-"NOT SET"} - fi + fi } ## Just Cause 2 @@ -149,13 +155,13 @@ elif [ "${engine}" == "projectzomboid" ]; then # Quake Live elif [ "${engine}" == "idtech3" ]; then fn_info_config_idtech3 -# ARMA 3 +# ARMA 3 elif [ "${engine}" == "realvirtuality" ]; then fn_info_config_realvirtuality -# Serious Sam +# Serious Sam elif [ "${engine}" == "seriousengine35" ]; then fn_info_config_seriousengine35 -# Source Engine Games +# Source Engine Games elif [ "${engine}" == "source" ]||[ "${engine}" == "goldsource" ]; then fn_info_config_source elif [ "${gamename}" == "Teamspeak 3" ]; then @@ -165,7 +171,7 @@ elif [ "${engine}" == "teeworlds" ]; then fn_info_config_teeworlds elif [ "${engine}" == "terraria" ]; then fn_info_config_terraria -# Unreal/Unreal 2 engine +# Unreal/Unreal 2 engine elif [ "${engine}" == "unreal" ]||[ "${engine}" == "unreal2" ]; then fn_info_config_unreal -fi \ No newline at end of file +fi From 6bd687399a841dca498e54a093fb8f303925c483 Mon Sep 17 00:00:00 2001 From: igeighty Date: Tue, 14 Jun 2016 19:48:17 +1000 Subject: [PATCH 2/3] Update monitor_gsquery.sh this fixes the monitor function for arma3 as @MPCP10 suggested --- lgsm/functions/monitor_gsquery.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/monitor_gsquery.sh b/lgsm/functions/monitor_gsquery.sh index bb1679e1f..9ac2c405b 100644 --- a/lgsm/functions/monitor_gsquery.sh +++ b/lgsm/functions/monitor_gsquery.sh @@ -25,6 +25,8 @@ if [ "${gsquery}" == "yes" ]; then if [ "${engine}" == "unreal" ]||[ "${engine}" == "unreal2" ]; then port=$((port + 1)) + elif [ "${engine}" == "virtualreality" ]; then + port=$((port + 1)) elif [ "${engine}" == "spark" ]; then port=$((port + 1)) fi @@ -86,4 +88,4 @@ if [ "${gsquery}" == "yes" ]; then done fi done -fi \ No newline at end of file +fi From f3e0172514ce087068e5580ab00a21f99f2d627f Mon Sep 17 00:00:00 2001 From: igeighty Date: Tue, 14 Jun 2016 22:48:19 +1000 Subject: [PATCH 3/3] Update monitor_gsquery.sh in the previous pull i had made, i mad e a typo, realvirtuality i got a bit keen and typed to quick. sorry guys, i have done a copy paste with the new spelling and it DOES work. sorry, very noob error. --- lgsm/functions/monitor_gsquery.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/monitor_gsquery.sh b/lgsm/functions/monitor_gsquery.sh index 9ac2c405b..99f6f1dcf 100644 --- a/lgsm/functions/monitor_gsquery.sh +++ b/lgsm/functions/monitor_gsquery.sh @@ -25,7 +25,7 @@ if [ "${gsquery}" == "yes" ]; then if [ "${engine}" == "unreal" ]||[ "${engine}" == "unreal2" ]; then port=$((port + 1)) - elif [ "${engine}" == "virtualreality" ]; then + elif [ "${engine}" == "realvirtuality" ]; then port=$((port + 1)) elif [ "${engine}" == "spark" ]; then port=$((port + 1))