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 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! 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 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