From 89a776d576138f0a34fa72e8b0368bd7c748b27c Mon Sep 17 00:00:00 2001 From: cedarlug Date: Mon, 22 Aug 2016 19:05:40 -0500 Subject: [PATCH 1/2] 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 2657c044ac5b43a2c95dda2832d69e79f6155ae9 Mon Sep 17 00:00:00 2001 From: cedarlug Date: Mon, 22 Aug 2016 19:08:49 -0500 Subject: [PATCH 2/2] 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