From 19b009c125ed7aeafd15f88fa06900af6d176b2e Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 2 Aug 2018 22:11:02 +0100 Subject: [PATCH 1/7] Steammaster finds if server is listed on steam master server --- lgsm/functions/info_distro.sh | 8 ++++++++ lgsm/functions/info_messages.sh | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 37adc0a196..1cfce51e2d 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -179,4 +179,12 @@ if [ -z "${extip}" ]; then echo "x.x.x.x" fi fi +fi + +# Steam Master Server - checks if detected by master server +steammaster=$(${curlpath} -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr=${ip}:${port}&format=json' | jq '.response.servers[]|.addr' | wc -l) +if [ "${steammaster}" == "1" ]; then + steammaster="yes" +else + steammaster="no" fi \ No newline at end of file diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index a5283c2f16..9c3324c65d 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -287,6 +287,11 @@ fn_info_message_gameserver(){ echo -e "${blue}Map rotation:\t${default}${randommap}" fi + # Listed on Master Server + if [ "${steammaster}" ];then + echo -e "${blue}Master Server:\t${default}${steammaster}" + fi + # Online status if [ "${status}" == "0" ]; then echo -e "${blue}Status:\t${red}OFFLINE${default}" From 88d31dd1b3b82772c8b4b3a68e12578a9551a3d9 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 2 Aug 2018 22:31:49 +0100 Subject: [PATCH 2/7] will not run if no IP address --- lgsm/functions/info_distro.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 1cfce51e2d..482b9ec535 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -182,9 +182,11 @@ if [ -z "${extip}" ]; then fi # Steam Master Server - checks if detected by master server -steammaster=$(${curlpath} -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr=${ip}:${port}&format=json' | jq '.response.servers[]|.addr' | wc -l) -if [ "${steammaster}" == "1" ]; then - steammaster="yes" -else - steammaster="no" +if [ "${ip}" ] && [ "${port}" ]; then + steammaster=$(${curlpath} -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr=${ip}:${port}&format=json' | jq '.response.servers[]|.addr' | wc -l) + if [ "${steammaster}" == "1" ]; then + steammaster="true" + else + steammaster="false" + fi fi \ No newline at end of file From 41db1231bb0ee498584c91a31f311c847fcc7568 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 2 Aug 2018 22:37:17 +0100 Subject: [PATCH 3/7] Fixed memory header deails alignment --- lgsm/functions/info_messages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 9c3324c65d..69e9ec1191 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -71,7 +71,7 @@ fn_info_message_performance(){ } | column -s $'\t' -t echo -e "" { - echo -e "${blue}Mem:\t${blue}total\t used\t free\t cached\t available${default}" + echo -e "${blue}Mem:\t${blue}total\tused\tfree\tcached\tavailable${default}" echo -e "${blue}Physical:\t${default}${physmemtotal}\t${physmemused}\t${physmemfree}\t${physmemcached}\t${physmemavailable}${default}" echo -e "${blue}Swap:\t${default}${swaptotal}\t${swapused}\t${swapfree}${default}" } | column -s $'\t' -t From 30d977c35eec15f4d52fbb73c11652d99ff07c32 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 2 Aug 2018 22:37:32 +0100 Subject: [PATCH 4/7] ip and port vars now work --- lgsm/functions/info_distro.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 482b9ec535..d9f1c5c79a 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -183,7 +183,7 @@ fi # Steam Master Server - checks if detected by master server if [ "${ip}" ] && [ "${port}" ]; then - steammaster=$(${curlpath} -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr=${ip}:${port}&format=json' | jq '.response.servers[]|.addr' | wc -l) + steammaster=$(${curlpath} -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${ip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l) if [ "${steammaster}" == "1" ]; then steammaster="true" else From 032364f32f3ffd1107d511e3f4a237cec43b2d46 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 2 Aug 2018 22:41:07 +0100 Subject: [PATCH 5/7] added colours to masterserver --- lgsm/functions/info_messages.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 69e9ec1191..437ea9d187 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -289,7 +289,11 @@ fn_info_message_gameserver(){ # Listed on Master Server if [ "${steammaster}" ];then - echo -e "${blue}Master Server:\t${default}${steammaster}" + if [ "${steammaster}" == "true" ];then + echo -e "${blue}Master Server:\t${green}${steammaster}${default}" + else + echo -e "${blue}Master Server:\t${red}${steammaster}${default}" + fi fi # Online status From a19705b2a6b98f22c3d09b8197f3db857f4c6324 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 12 Aug 2018 22:12:02 +0100 Subject: [PATCH 6/7] Steam Master Server filtered to only support * Source * GoldSource * Quake Live * Just Cause 2 If there are any servers that do use the steam master server that has been missed let us know --- lgsm/functions/info_distro.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 574582352c..0b46a44a40 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -175,10 +175,12 @@ fi # Steam Master Server - checks if detected by master server if [ "${ip}" ] && [ "${port}" ]; then - steammaster=$(${curlpath} -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${ip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l) - if [ "${steammaster}" == "1" ]; then - steammaster="true" - else - steammaster="false" + if [ "${engine}" == "source" ]||[ "${engine}" == "goldsource" ]||[ "${shortname}" == "jc2" ]||[ "${shortname}" == "ql" ]; then + steammaster=$(${curlpath} -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${ip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l) + if [ "${steammaster}" == "1" ]; then + steammaster="true" + else + steammaster="false" + fi fi fi \ No newline at end of file From 3592886378db7c2391e3974d558f050f8478285c Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 12 Aug 2018 22:14:55 +0100 Subject: [PATCH 7/7] changed steammaster to masterserver --- lgsm/functions/info_distro.sh | 6 +++--- lgsm/functions/info_messages.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 0b46a44a40..71e3aa33c3 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -176,11 +176,11 @@ fi # Steam Master Server - checks if detected by master server if [ "${ip}" ] && [ "${port}" ]; then if [ "${engine}" == "source" ]||[ "${engine}" == "goldsource" ]||[ "${shortname}" == "jc2" ]||[ "${shortname}" == "ql" ]; then - steammaster=$(${curlpath} -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${ip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l) + masterserver=$(${curlpath} -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${ip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l) if [ "${steammaster}" == "1" ]; then - steammaster="true" + masterserver="true" else - steammaster="false" + masterserver="false" fi fi fi \ No newline at end of file diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 49993acdd2..ebe44854da 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -288,11 +288,11 @@ fn_info_message_gameserver(){ fi # Listed on Master Server - if [ "${steammaster}" ];then - if [ "${steammaster}" == "true" ];then - echo -e "${blue}Master Server:\t${green}${steammaster}${default}" + if [ "${masterserver}" ];then + if [ "${masterserver}" == "true" ];then + echo -e "${blue}Master Server:\t${green}${masterserver}${default}" else - echo -e "${blue}Master Server:\t${red}${steammaster}${default}" + echo -e "${blue}Master Server:\t${red}${masterserver}${default}" fi fi