From dfeeba76e928f5f7f21d4e623ac1fab56bd907d8 Mon Sep 17 00:00:00 2001 From: cedarlug Date: Mon, 22 Aug 2016 21:17:43 -0500 Subject: [PATCH 1/4] This fixes an issue where the log file being parsed contains multiple instances of the version number. When the egrep expression returns multiple lines, the formation of the version number around line 133 ( the tr command ) that pulls out everything but numbers generates a (potentially) enormous string. Reference: http://steamcommunity.com/groups/linuxgsm/discussions/0/361798516936473435/ --- lgsm/functions/update_ts3.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/update_ts3.sh b/lgsm/functions/update_ts3.sh index e4ee2ddc6..9a6599942 100644 --- a/lgsm/functions/update_ts3.sh +++ b/lgsm/functions/update_ts3.sh @@ -48,7 +48,7 @@ fn_update_ts3_currentbuild(){ fi # Get current build from logs - currentbuild=$(cat $(find ./* -name 'ts3server*_0.log' 2> /dev/null | sort | egrep -E -v '${rootdir}/.ts3version' | tail -1) | egrep -o 'TeamSpeak 3 Server ((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}' | egrep -o '((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}') + currentbuild=$(cat $(find ./* -name 'ts3server*_0.log' 2> /dev/null | sort | egrep -E -v '${rootdir}/.ts3version' | tail -1) | egrep -o 'TeamSpeak 3 Server ((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}' | egrep -o '((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}' | sort -V | tail -1) if [ -z "${currentbuild}" ]; then fn_print_error_nl "Checking for update: teamspeak.com: Current build version not found" fn_script_log_error "Checking for update: teamspeak.com: Current build version not found" @@ -194,4 +194,4 @@ else fn_update_ts3_currentbuild fn_update_ts3_availablebuild fn_update_ts3_compare -fi \ No newline at end of file +fi From f33bfc19fd61fef8cd3ab22d2a4fd51bd8e43415 Mon Sep 17 00:00:00 2001 From: cedarlug Date: Mon, 22 Aug 2016 21:19:41 -0500 Subject: [PATCH 2/4] Adding the new versus mode option to the configuration file. --- FistfulOfFrags/cfg/lgsm-default.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/FistfulOfFrags/cfg/lgsm-default.cfg b/FistfulOfFrags/cfg/lgsm-default.cfg index 81d9929fc..615720feb 100644 --- a/FistfulOfFrags/cfg/lgsm-default.cfg +++ b/FistfulOfFrags/cfg/lgsm-default.cfg @@ -31,6 +31,7 @@ sv_lan 0 // "mapcycle_12.txt" - All 12 slot maps for Shootout/2 Team Shootout/4 Team Shootout // "mapcycle_32.txt" - All 32 slot maps for Shootout/2 Team Shootout/4 Team Shootout // "mapcycle_tp.txt" - All Teamplay maps +// "mapcycle_vs.txt" - All versus mode maps // "mapcycle_gt.txt" - All Ghost Town maps mapcyclefile "mapcycle.txt" @@ -48,11 +49,12 @@ mp_timelimit 15 // 2 = Teamplay // 3 = Break Bad // 4 = Elimination +// 5 = Versus fof_sv_currentmode 1 // Teamplay // 0 = Free-for-all -// 1 = Team Deathmatch +// 1 = Team Deathmatch or Teamplay mode mp_teamplay 0 // Team numbers @@ -121,4 +123,4 @@ sv_logfile 1 // Log server information to only one file. // Default: sv_log_onefile 0 -sv_log_onefile 0 \ No newline at end of file +sv_log_onefile 0 From 215aae3397d6f07bce7b26a1932419c169d127ae Mon Sep 17 00:00:00 2001 From: cedarlug Date: Tue, 23 Aug 2016 06:36:34 -0500 Subject: [PATCH 3/4] mumble's IP address is hard set with the 'host=' setting in the ini file. check_ip's result returns an error due to looking for the ip setting in the server script. This commit bypasses the issue allowing `details` functionality to work once again. --- lgsm/functions/check_ip.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh index 8c1c264c2..0ba8bcbf3 100644 --- a/lgsm/functions/check_ip.sh +++ b/lgsm/functions/check_ip.sh @@ -8,7 +8,7 @@ local commandname="CHECK" local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" -if [ "${gamename}" != "TeamSpeak 3" ]; then +if [ "${gamename}" != "TeamSpeak 3" ] && [ "${gamename}" != "Mumble" ]; then if [ ! -f "/bin/ip" ]; then ipcommand="/sbin/ip" else From 5feb12a846952e2f90547e22521b88d703b05616 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 23 Aug 2016 21:35:15 +0100 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 844d13257..72e57fa62 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ All FAQ can be found here. https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ

Donate

-If you want to donate to the project you can via PayPal, Flattr or Gratipay. I have had a may kind people show their support by sending me a donation. Any donations you send help cover my server costs and buy me a drink. Cheers! +If you want to donate to the project you can via PayPal. I have had a may kind people show their support by sending me a donation. Any donations you send help cover my server costs and buy me a drink. Cheers!