From 176919c2c873d382d5fe8e2e6e533fc78ac5c13a Mon Sep 17 00:00:00 2001 From: jakubsuchybio Date: Wed, 1 Jun 2016 00:58:29 +0200 Subject: [PATCH 1/7] Add variable to set email's sender 'emailfrom' --- CounterStrikeGlobalOffensive/csgoserver | 5 +++-- lgsm/functions/alert_email.sh | 24 ++++++++++++++---------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver index 940115c9c..359038ad0 100755 --- a/CounterStrikeGlobalOffensive/csgoserver +++ b/CounterStrikeGlobalOffensive/csgoserver @@ -19,8 +19,9 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" -# Pushbullet +# Pushbullet # https://www.pushbullet.com/#settings pushbulletalert="off" pushbullettoken="accesstoken" @@ -147,7 +148,7 @@ if [ ! -f "${filedir}/${filename}" ]; then exit 1 else echo -e "\e[0;32mOK\e[0m" - fi + fi else echo -e "\e[0;31mFAIL\e[0m\n" echo "Curl is not installed!" diff --git a/lgsm/functions/alert_email.sh b/lgsm/functions/alert_email.sh index c3f56b5ef..0a7acde47 100644 --- a/lgsm/functions/alert_email.sh +++ b/lgsm/functions/alert_email.sh @@ -28,7 +28,7 @@ fn_details_os(){ # Hostname: hostname # tmux: tmux 1.8 # GLIBC: 2.19 - + { echo -e "" echo -e "Distro Details" @@ -56,7 +56,7 @@ fn_details_performance(){ { echo -e "" echo -e "Performance" - echo -e "=================================" + echo -e "=================================" echo -e "Uptime: ${days}d, ${hours}h, ${minutes}m" echo -e "Avg Load: ${load}" echo -e "" @@ -124,7 +124,7 @@ fn_details_gameserver(){ echo -e "RCON password: ********" fi - # Admin password + # Admin password if [ -n "${adminpassword}" ]; then echo -e "Admin password: ********" fi @@ -172,7 +172,7 @@ fn_alert_email_template_logs(){ { echo -e "" echo -e "${servicename} Logs" - echo -e "=================================" + echo -e "=================================" if [ -n "${scriptlog}" ]; then echo -e "\nScript log\n===================" @@ -180,7 +180,7 @@ fn_alert_email_template_logs(){ echo "${scriptlogdir} (NO LOG FILES)" elif [ ! -s "${scriptlog}" ]; then echo "${scriptlog} (LOG FILE IS EMPTY)" - else + else echo "${scriptlog}" tail -25 "${scriptlog}" fi @@ -193,7 +193,7 @@ fn_alert_email_template_logs(){ echo "${consolelogdir} (NO LOG FILES)" elif [ ! -s "${consolelog}" ]; then echo "${consolelog} (LOG FILE IS EMPTY)" - else + else echo "${consolelog}" tail -25 "${consolelog}" | awk '{ sub("\r$", ""); print }' fi @@ -204,12 +204,12 @@ fn_alert_email_template_logs(){ echo -e "\nServer log\n===================" if [ ! "$(ls -A ${gamelogdir})" ]; then echo "${gamelogdir} (NO LOG FILES)" - else + else echo "${gamelogdir}" tail "${gamelogdir}"/* | grep -v "==>" | sed '/^$/d' | tail -25 fi echo "" - fi + fi } | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"| tee -a "${emaillog}" > /dev/null 2>&1 } @@ -223,14 +223,18 @@ check_ip.sh emaillog="${emaillog}" if [ -f "${emaillog}" ]; then rm "${emaillog}" -fi +fi fn_details_email fn_details_os fn_details_performance fn_details_disk fn_details_gameserver fn_alert_email_template_logs -mail -s "${alertsubject}" "${email}" < "${emaillog}" +if [ -n "${emailfrom}" ]; then + mail -s "${alertsubject}" -a "From: ${emailfrom}" "${email}" < "${emaillog}" +else + mail -s "${alertsubject}" "${email}" < "${emaillog}" +fi exitcode=$? if [ "${exitcode}" == "0" ]; then fn_print_ok_nl "Sending alert to ${email}" From 8a60df0bab3d944532ae77b5b37ca78147cabc76 Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Tue, 13 Sep 2016 19:50:41 +0200 Subject: [PATCH 2/7] Corrected URL --- lgsm/functions/check_permissions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/check_permissions.sh b/lgsm/functions/check_permissions.sh index 32e8d84e3..3b5e52005 100644 --- a/lgsm/functions/check_permissions.sh +++ b/lgsm/functions/check_permissions.sh @@ -43,8 +43,8 @@ fn_check_ownership(){ } | column -s $'\t' -t | tee -a "${scriptlog}" echo "" - fn_print_information_nl "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found" - fn_script_log "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found" + fn_print_information_nl "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-ownership-issues-found" + fn_script_log "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-ownership-issues-found" core_exit.sh fi } From f5cffd7ae82f851d89159ac4cc9dec0217ba76ba Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 14 Sep 2016 22:17:53 +0100 Subject: [PATCH 3/7] updated licence year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 64aaf3c3f..24a57533c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 Daniel Gibbs +Copyright (c) 2016 Daniel Gibbs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 67402a1020238b6011390b262c71b94415168cd4 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 14 Sep 2016 22:45:26 +0100 Subject: [PATCH 4/7] added emailfrom --- 7DaysToDie/sdtdserver | 1 + ARKSurvivalEvolved/arkserver | 1 + Arma3/arma3server | 1 + Battlefield1942/bf1942server | 1 + BlackMesa/bmdmserver | 1 + BladeSymphony/bsserver | 1 + BrainBread2/bb2server | 1 + CodenameCURE/ccserver | 1 + CounterStrike/csserver | 1 + CounterStrikeConditionZero/csczserver | 1 + CounterStrikeSource/cssserver | 1 + DayOfDefeat/dodserver | 1 + DayOfDefeatSource/dodsserver | 1 + DayOfInfamy/doiserver | 1 + DeathmatchClassic/dmcserver | 1 + DontStarveTogether/dstserver | 1 + DoubleActionBoogaloo/dabserver | 1 + EmpiresMod/emserver | 1 + FistfulOfFrags/fofserver | 1 + GarrysMod/gmodserver | 1 + GoldenEyeSource/gesserver | 1 + HalfLife2Deathmatch/hl2dmserver | 1 + HalfLifeDeathmatch/hldmserver | 1 + HalfLifeDeathmatchSource/hldmsserver | 1 + Hurtworld/hwserver | 1 + Insurgency/insserver | 1 + JustCause2/jc2server | 1 + KillingFloor/kfserver | 1 + Left4Dead/l4dserver | 1 + Left4Dead2/l4d2server | 1 + Minecraft/mcserver | 1 + Mumble/mumbleserver | 1 + NS2Combat/ns2cserver | 1 + NaturalSelection2/ns2server | 1 + NoMoreRoomInHell/nmrihserver | 1 + OpposingForce/opforserver | 1 + PiratesVikingandKnightsII/pvkiiserver | 1 + ProjectZomboid/pzserver | 1 + QuakeLive/qlserver | 1 + RedOrchestra/roserver | 1 + Ricochet/ricochetserver | 1 + Rust/rustserver | 1 + SeriousSam3BFE/ss3sserver | 1 + Starbound/sbserver | 1 + SvenCoop/svencoopserver | 1 + TeamFortress2/tf2server | 1 + TeamFortressClassic/tfcserver | 1 + TeamSpeak3/ts3server | 1 + Teeworlds/twserver | 1 + Terraria/terrariaserver | 1 + UnrealTournament/utserver | 1 + UnrealTournament2004/ut2k4server | 1 + UnrealTournament3/ut3server | 1 + UnrealTournament99/ut99server | 1 + WolfensteinEnemyTerritory/wetserver | 1 + tests/tests_jc2server.sh | 1 + tests/tests_ts3server.sh | 1 + 57 files changed, 57 insertions(+) diff --git a/7DaysToDie/sdtdserver b/7DaysToDie/sdtdserver index 72a7bcaf8..9fe9efd3e 100644 --- a/7DaysToDie/sdtdserver +++ b/7DaysToDie/sdtdserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/ARKSurvivalEvolved/arkserver b/ARKSurvivalEvolved/arkserver index 58840fd0f..6caa8dc9c 100644 --- a/ARKSurvivalEvolved/arkserver +++ b/ARKSurvivalEvolved/arkserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/Arma3/arma3server b/Arma3/arma3server index 70039ba37..0ea448460 100644 --- a/Arma3/arma3server +++ b/Arma3/arma3server @@ -20,6 +20,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/Battlefield1942/bf1942server b/Battlefield1942/bf1942server index ba3f93587..b0686992e 100644 --- a/Battlefield1942/bf1942server +++ b/Battlefield1942/bf1942server @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/BlackMesa/bmdmserver b/BlackMesa/bmdmserver index 9250d2a5b..8f7f8364e 100644 --- a/BlackMesa/bmdmserver +++ b/BlackMesa/bmdmserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/BladeSymphony/bsserver b/BladeSymphony/bsserver index 4d9960123..4fc56c14b 100644 --- a/BladeSymphony/bsserver +++ b/BladeSymphony/bsserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/BrainBread2/bb2server b/BrainBread2/bb2server index 669be4e11..9d57449d5 100644 --- a/BrainBread2/bb2server +++ b/BrainBread2/bb2server @@ -19,6 +19,7 @@ version="030616" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/CodenameCURE/ccserver b/CodenameCURE/ccserver index 7abd395cf..e0fd50c97 100644 --- a/CodenameCURE/ccserver +++ b/CodenameCURE/ccserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/CounterStrike/csserver b/CounterStrike/csserver index 977a06225..884d22c23 100644 --- a/CounterStrike/csserver +++ b/CounterStrike/csserver @@ -19,6 +19,7 @@ version="060816" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/CounterStrikeConditionZero/csczserver b/CounterStrikeConditionZero/csczserver index 2b0ff70dd..e01bb06c1 100644 --- a/CounterStrikeConditionZero/csczserver +++ b/CounterStrikeConditionZero/csczserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver index edd7a7c08..3e5fdf644 100644 --- a/CounterStrikeSource/cssserver +++ b/CounterStrikeSource/cssserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/DayOfDefeat/dodserver b/DayOfDefeat/dodserver index 12168ee28..1da45e816 100644 --- a/DayOfDefeat/dodserver +++ b/DayOfDefeat/dodserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver index 545b0a50d..04c49e145 100644 --- a/DayOfDefeatSource/dodsserver +++ b/DayOfDefeatSource/dodsserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/DayOfInfamy/doiserver b/DayOfInfamy/doiserver index b8641bc87..bda392bff 100644 --- a/DayOfInfamy/doiserver +++ b/DayOfInfamy/doiserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/DeathmatchClassic/dmcserver b/DeathmatchClassic/dmcserver index 654072aa5..3aa5abbf8 100644 --- a/DeathmatchClassic/dmcserver +++ b/DeathmatchClassic/dmcserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/DontStarveTogether/dstserver b/DontStarveTogether/dstserver index e9ecfbd05..9a23a9297 100644 --- a/DontStarveTogether/dstserver +++ b/DontStarveTogether/dstserver @@ -19,6 +19,7 @@ version="130516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/DoubleActionBoogaloo/dabserver b/DoubleActionBoogaloo/dabserver index 41e3d4cd8..d83f7b165 100644 --- a/DoubleActionBoogaloo/dabserver +++ b/DoubleActionBoogaloo/dabserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/EmpiresMod/emserver b/EmpiresMod/emserver index 3d51fbff7..9fd6d92f8 100644 --- a/EmpiresMod/emserver +++ b/EmpiresMod/emserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/FistfulOfFrags/fofserver b/FistfulOfFrags/fofserver index 1f263eee2..890e40eb4 100644 --- a/FistfulOfFrags/fofserver +++ b/FistfulOfFrags/fofserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/GarrysMod/gmodserver b/GarrysMod/gmodserver index 7c9179c4b..fcac6ef56 100644 --- a/GarrysMod/gmodserver +++ b/GarrysMod/gmodserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/GoldenEyeSource/gesserver b/GoldenEyeSource/gesserver index 641258936..8e887476f 100644 --- a/GoldenEyeSource/gesserver +++ b/GoldenEyeSource/gesserver @@ -19,6 +19,7 @@ version="300816" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/HalfLife2Deathmatch/hl2dmserver b/HalfLife2Deathmatch/hl2dmserver index df2a3060b..f6c2789a9 100644 --- a/HalfLife2Deathmatch/hl2dmserver +++ b/HalfLife2Deathmatch/hl2dmserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/HalfLifeDeathmatch/hldmserver b/HalfLifeDeathmatch/hldmserver index 57a414f1f..239ebefe2 100644 --- a/HalfLifeDeathmatch/hldmserver +++ b/HalfLifeDeathmatch/hldmserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/HalfLifeDeathmatchSource/hldmsserver b/HalfLifeDeathmatchSource/hldmsserver index 7e847fa12..cdb79c320 100644 --- a/HalfLifeDeathmatchSource/hldmsserver +++ b/HalfLifeDeathmatchSource/hldmsserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/Hurtworld/hwserver b/Hurtworld/hwserver index 34728b3c8..58f1314be 100644 --- a/Hurtworld/hwserver +++ b/Hurtworld/hwserver @@ -20,6 +20,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/Insurgency/insserver b/Insurgency/insserver index ae7937733..9efdc2264 100644 --- a/Insurgency/insserver +++ b/Insurgency/insserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/JustCause2/jc2server b/JustCause2/jc2server index 1c97e6a4d..6b0321259 100644 --- a/JustCause2/jc2server +++ b/JustCause2/jc2server @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/KillingFloor/kfserver b/KillingFloor/kfserver index 40f35d77c..ff3fc5a57 100644 --- a/KillingFloor/kfserver +++ b/KillingFloor/kfserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/Left4Dead/l4dserver b/Left4Dead/l4dserver index a19ea6582..156222681 100644 --- a/Left4Dead/l4dserver +++ b/Left4Dead/l4dserver @@ -20,6 +20,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server index 7d38cd071..1ce64a0ee 100644 --- a/Left4Dead2/l4d2server +++ b/Left4Dead2/l4d2server @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/Minecraft/mcserver b/Minecraft/mcserver index e9bb190fe..71c5e207f 100644 --- a/Minecraft/mcserver +++ b/Minecraft/mcserver @@ -19,6 +19,7 @@ version="210816" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/Mumble/mumbleserver b/Mumble/mumbleserver index ba7db3da3..79a61ee01 100644 --- a/Mumble/mumbleserver +++ b/Mumble/mumbleserver @@ -20,6 +20,7 @@ version="290716" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/NS2Combat/ns2cserver b/NS2Combat/ns2cserver index 559511eec..db27573a9 100644 --- a/NS2Combat/ns2cserver +++ b/NS2Combat/ns2cserver @@ -19,6 +19,7 @@ version="220416" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/NaturalSelection2/ns2server b/NaturalSelection2/ns2server index 94320f0da..694dbd958 100644 --- a/NaturalSelection2/ns2server +++ b/NaturalSelection2/ns2server @@ -19,6 +19,7 @@ version="220416" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/NoMoreRoomInHell/nmrihserver b/NoMoreRoomInHell/nmrihserver index 0a68e2812..171f9bfbd 100644 --- a/NoMoreRoomInHell/nmrihserver +++ b/NoMoreRoomInHell/nmrihserver @@ -19,6 +19,7 @@ version="130716" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/OpposingForce/opforserver b/OpposingForce/opforserver index 58f72e481..9a283f014 100644 --- a/OpposingForce/opforserver +++ b/OpposingForce/opforserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/PiratesVikingandKnightsII/pvkiiserver b/PiratesVikingandKnightsII/pvkiiserver index 5abecfa19..3c45f30a5 100644 --- a/PiratesVikingandKnightsII/pvkiiserver +++ b/PiratesVikingandKnightsII/pvkiiserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/ProjectZomboid/pzserver b/ProjectZomboid/pzserver index c07be1e49..ed501ac9b 100644 --- a/ProjectZomboid/pzserver +++ b/ProjectZomboid/pzserver @@ -20,6 +20,7 @@ version="290716" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/QuakeLive/qlserver b/QuakeLive/qlserver index 19b27b27e..02f621632 100755 --- a/QuakeLive/qlserver +++ b/QuakeLive/qlserver @@ -19,6 +19,7 @@ version="060516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/RedOrchestra/roserver b/RedOrchestra/roserver index 1d0a39341..4f1c416ff 100644 --- a/RedOrchestra/roserver +++ b/RedOrchestra/roserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/Ricochet/ricochetserver b/Ricochet/ricochetserver index 68664448f..b35fbc86a 100644 --- a/Ricochet/ricochetserver +++ b/Ricochet/ricochetserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/Rust/rustserver b/Rust/rustserver index afe0c662a..a187b3f4f 100644 --- a/Rust/rustserver +++ b/Rust/rustserver @@ -20,6 +20,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/SeriousSam3BFE/ss3sserver b/SeriousSam3BFE/ss3sserver index 7302c282b..c677d0bbc 100644 --- a/SeriousSam3BFE/ss3sserver +++ b/SeriousSam3BFE/ss3sserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/Starbound/sbserver b/Starbound/sbserver index 3ad6afdf9..6db458b57 100644 --- a/Starbound/sbserver +++ b/Starbound/sbserver @@ -19,6 +19,7 @@ version="230716" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/SvenCoop/svencoopserver b/SvenCoop/svencoopserver index 1043cdfd3..c6f7ba086 100644 --- a/SvenCoop/svencoopserver +++ b/SvenCoop/svencoopserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/TeamFortress2/tf2server b/TeamFortress2/tf2server index 335af8b4a..6d5062848 100644 --- a/TeamFortress2/tf2server +++ b/TeamFortress2/tf2server @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/TeamFortressClassic/tfcserver b/TeamFortressClassic/tfcserver index 53455703e..7480e25c8 100644 --- a/TeamFortressClassic/tfcserver +++ b/TeamFortressClassic/tfcserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/TeamSpeak3/ts3server b/TeamSpeak3/ts3server index 1e7ad5952..101b3552d 100644 --- a/TeamSpeak3/ts3server +++ b/TeamSpeak3/ts3server @@ -19,6 +19,7 @@ version="290716" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/Teeworlds/twserver b/Teeworlds/twserver index cd81024c0..90f370d3f 100644 --- a/Teeworlds/twserver +++ b/Teeworlds/twserver @@ -20,6 +20,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/Terraria/terrariaserver b/Terraria/terrariaserver index 9dd94a0f5..b669fb968 100644 --- a/Terraria/terrariaserver +++ b/Terraria/terrariaserver @@ -20,6 +20,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/UnrealTournament/utserver b/UnrealTournament/utserver index f7e5e2981..66cdb526a 100644 --- a/UnrealTournament/utserver +++ b/UnrealTournament/utserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/UnrealTournament2004/ut2k4server b/UnrealTournament2004/ut2k4server index 4eec3e473..9bf79457c 100644 --- a/UnrealTournament2004/ut2k4server +++ b/UnrealTournament2004/ut2k4server @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/UnrealTournament3/ut3server b/UnrealTournament3/ut3server index 97f768974..55bd2a171 100644 --- a/UnrealTournament3/ut3server +++ b/UnrealTournament3/ut3server @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/UnrealTournament99/ut99server b/UnrealTournament99/ut99server index aa4dc9339..a6851fcaa 100644 --- a/UnrealTournament99/ut99server +++ b/UnrealTournament99/ut99server @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/WolfensteinEnemyTerritory/wetserver b/WolfensteinEnemyTerritory/wetserver index 86f4f0839..f9ef1fe91 100644 --- a/WolfensteinEnemyTerritory/wetserver +++ b/WolfensteinEnemyTerritory/wetserver @@ -19,6 +19,7 @@ version="210516" # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index c5f69f734..dc6104b31 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -19,6 +19,7 @@ fi # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh index fb416d633..da9c7808a 100644 --- a/tests/tests_ts3server.sh +++ b/tests/tests_ts3server.sh @@ -19,6 +19,7 @@ fi # Email emailalert="off" email="email@example.com" +#emailfrom="email@example.com" # Pushbullet # https://www.pushbullet.com/#settings From 2a5896488722877ee17c761b869c23ab42c89309 Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Fri, 16 Sep 2016 15:16:25 +0200 Subject: [PATCH 5/7] Added Steam App Branch Selects --- 7DaysToDie/sdtdserver | 7 ++++++- ARKSurvivalEvolved/arkserver | 7 ++++++- Arma3/arma3server | 10 ++++++---- BlackMesa/bmdmserver | 7 ++++++- BladeSymphony/bsserver | 7 ++++++- BrainBread2/bb2server | 7 ++++++- CodenameCURE/ccserver | 7 ++++++- CounterStrikeSource/cssserver | 7 ++++++- DayOfDefeatSource/dodsserver | 7 ++++++- DayOfInfamy/doiserver | 7 ++++++- DontStarveTogether/dstserver | 7 ++++++- DoubleActionBoogaloo/dabserver | 7 ++++++- EmpiresMod/emserver | 7 ++++++- FistfulOfFrags/fofserver | 7 ++++++- GarrysMod/gmodserver | 7 ++++++- Hurtworld/hwserver | 7 ++++++- Insurgency/insserver | 7 ++++++- JustCause2/jc2server | 7 ++++++- KillingFloor/kfserver | 7 ++++++- Left4Dead/l4dserver | 7 ++++++- Left4Dead2/l4d2server | 7 ++++++- NS2Combat/ns2cserver | 7 ++++++- NoMoreRoomInHell/nmrihserver | 7 ++++++- PiratesVikingandKnightsII/pvkiiserver | 7 ++++++- ProjectZomboid/pzserver | 8 +++++--- QuakeLive/qlserver | 9 +++++++-- Rust/rustserver | 7 ++++++- SeriousSam3BFE/ss3sserver | 7 ++++++- Starbound/sbserver | 7 ++++++- SvenCoop/svencoopserver | 7 ++++++- TeamFortress2/tf2server | 7 ++++++- 31 files changed, 186 insertions(+), 37 deletions(-) diff --git a/7DaysToDie/sdtdserver b/7DaysToDie/sdtdserver index 9fe9efd3e..f46c1ce5c 100644 --- a/7DaysToDie/sdtdserver +++ b/7DaysToDie/sdtdserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -51,6 +51,11 @@ githubbranch="master" # Steam appid="294420" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta latest_experimental" +branch="" + # Server Details servicename="sdtd-server" gamename="7 Days To Die" diff --git a/ARKSurvivalEvolved/arkserver b/ARKSurvivalEvolved/arkserver index 6caa8dc9c..62c756189 100644 --- a/ARKSurvivalEvolved/arkserver +++ b/ARKSurvivalEvolved/arkserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -56,6 +56,11 @@ githubbranch="master" # Steam appid="376030" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta" +branch="" + # Server Details servicename="ark-server" gamename="ARK: Survivial Evolved" diff --git a/Arma3/arma3server b/Arma3/arma3server index 0ea448460..c140f9aa3 100644 --- a/Arma3/arma3server +++ b/Arma3/arma3server @@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -65,10 +65,12 @@ githubrepo="LinuxGSM" githubbranch="master" # Steam -# Stable appid="233780" -# Development -# appid="233780 -beta development" + +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta development" +branch="" # Server Details servicename="arma3-server" diff --git a/BlackMesa/bmdmserver b/BlackMesa/bmdmserver index 8f7f8364e..1fd97ff82 100644 --- a/BlackMesa/bmdmserver +++ b/BlackMesa/bmdmserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -61,6 +61,11 @@ githubbranch="master" # Steam appid="346680" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta public-beta" +branch="" + # Server Details servicename="bmdm-server" gamename="Black Mesa: Deathmatch" diff --git a/BladeSymphony/bsserver b/BladeSymphony/bsserver index 4fc56c14b..57ee13f2f 100644 --- a/BladeSymphony/bsserver +++ b/BladeSymphony/bsserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -56,6 +56,11 @@ githubbranch="master" # Steam appid="228780" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta nightly -betapassword winteriscoming" +branch="" + # Server Details servicename="bs-server" gamename="Blade Symphony" diff --git a/BrainBread2/bb2server b/BrainBread2/bb2server index 9d57449d5..d3a8c37df 100644 --- a/BrainBread2/bb2server +++ b/BrainBread2/bb2server @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="030616" +version="160916" #### Variables #### @@ -61,6 +61,11 @@ githubbranch="master" # Steam appid="475370" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta_branch" +branch="" + # Server Details servicename="bb2-server" gamename="BrainBread 2" diff --git a/CodenameCURE/ccserver b/CodenameCURE/ccserver index e0fd50c97..7a7f299dd 100644 --- a/CodenameCURE/ccserver +++ b/CodenameCURE/ccserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -56,6 +56,11 @@ githubbranch="master" # Steam appid="383410" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta" +branch="" + # Server Details servicename="cc-server" gamename="Codename CURE" diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver index 3e5fdf644..be91fa277 100644 --- a/CounterStrikeSource/cssserver +++ b/CounterStrikeSource/cssserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -61,6 +61,11 @@ githubbranch="master" # Steam appid="232330" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta prerelease" +branch="" + # Server Details servicename="css-server" gamename="Counter-Strike: Source" diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver index 04c49e145..2e4dae73f 100644 --- a/DayOfDefeatSource/dodsserver +++ b/DayOfDefeatSource/dodsserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -56,6 +56,11 @@ githubbranch="master" # Steam appid="232290" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta prerelease" +branch="" + # Server Details servicename="dods-server" gamename="Day of Defeat: Source" diff --git a/DayOfInfamy/doiserver b/DayOfInfamy/doiserver index bda392bff..532fef76e 100644 --- a/DayOfInfamy/doiserver +++ b/DayOfInfamy/doiserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -58,6 +58,11 @@ githubbranch="master" # Steam appid="462310" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta" +branch="" + # Server Details servicename="doi-server" gamename="Day of Infamy" diff --git a/DontStarveTogether/dstserver b/DontStarveTogether/dstserver index 9a23a9297..8b41b9403 100644 --- a/DontStarveTogether/dstserver +++ b/DontStarveTogether/dstserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="130516" +version="160916" #### Variables #### @@ -54,6 +54,11 @@ githubbranch="master" # Steam appid="343050" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta anewreignbeta" +branch="" + # Server Details servicename="dst-server" gamename="Don't Starve Together" diff --git a/DoubleActionBoogaloo/dabserver b/DoubleActionBoogaloo/dabserver index d83f7b165..1b59fd369 100644 --- a/DoubleActionBoogaloo/dabserver +++ b/DoubleActionBoogaloo/dabserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -56,6 +56,11 @@ githubbranch="master" # Steam appid="317800" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta" +branch="" + # Server Details servicename="dab-server" gamename="Double Action: Boogaloo" diff --git a/EmpiresMod/emserver b/EmpiresMod/emserver index 9fd6d92f8..02897b313 100644 --- a/EmpiresMod/emserver +++ b/EmpiresMod/emserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -61,6 +61,11 @@ githubbranch="master" # Steam appid="460040" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta" +branch="" + # Server Details servicename="em-server" gamename="Empires Mod" diff --git a/FistfulOfFrags/fofserver b/FistfulOfFrags/fofserver index 890e40eb4..3eaa08911 100644 --- a/FistfulOfFrags/fofserver +++ b/FistfulOfFrags/fofserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -56,6 +56,11 @@ githubbranch="master" # Steam appid="295230" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta" +branch="" + # Server Details servicename="fof-server" gamename="Fistful of Frags" diff --git a/GarrysMod/gmodserver b/GarrysMod/gmodserver index fcac6ef56..3aeb63c62 100644 --- a/GarrysMod/gmodserver +++ b/GarrysMod/gmodserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -77,6 +77,11 @@ githubbranch="master" # Steam appid="4020" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta dev" +branch="" + # Server Details servicename="gmod-server" gamename="Garry's Mod" diff --git a/Hurtworld/hwserver b/Hurtworld/hwserver index 58f1314be..253a4ce81 100644 --- a/Hurtworld/hwserver +++ b/Hurtworld/hwserver @@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -70,6 +70,11 @@ githubbranch="master" # Steam appid="405100" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta devtest" +branch="" + # Server Details servicename="hurtworld-server" gamename="Hurtworld" diff --git a/Insurgency/insserver b/Insurgency/insserver index 9efdc2264..e5cfcb520 100644 --- a/Insurgency/insserver +++ b/Insurgency/insserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -58,6 +58,11 @@ githubbranch="master" # Steam appid="237410" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta" +branch="" + # Server Details servicename="ins-server" gamename="Insurgency" diff --git a/JustCause2/jc2server b/JustCause2/jc2server index 6b0321259..ab1b81d19 100644 --- a/JustCause2/jc2server +++ b/JustCause2/jc2server @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -50,6 +50,11 @@ githubbranch="master" # Steam appid="261140" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta publicbeta" +branch="" + # Server Details servicename="jc2-server" gamename="Just Cause 2" diff --git a/KillingFloor/kfserver b/KillingFloor/kfserver index ff3fc5a57..1c7093d34 100644 --- a/KillingFloor/kfserver +++ b/KillingFloor/kfserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -55,6 +55,11 @@ githubbranch="master" # Steam appid="215360" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta" +branch="" + # Server Details servicename="kf-server" gamename="Killing Floor" diff --git a/Left4Dead/l4dserver b/Left4Dead/l4dserver index 156222681..995308cd0 100644 --- a/Left4Dead/l4dserver +++ b/Left4Dead/l4dserver @@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -56,6 +56,11 @@ githubbranch="master" # Steam appid="222840" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta" +branch="" + # Server Details servicename="l4d-server" gamename="Left 4 Dead" diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server index 1ce64a0ee..1443327e5 100644 --- a/Left4Dead2/l4d2server +++ b/Left4Dead2/l4d2server @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -55,6 +55,11 @@ githubbranch="master" # Steam appid="222860" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta" +branch="" + # Server Details servicename="l4d2-server" gamename="Left 4 Dead 2" diff --git a/NS2Combat/ns2cserver b/NS2Combat/ns2cserver index db27573a9..b935f7472 100644 --- a/NS2Combat/ns2cserver +++ b/NS2Combat/ns2cserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="220416" +version="160916" #### Variables #### @@ -63,6 +63,11 @@ githubbranch="master" # Steam appid="313900" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta" +branch="" + # Server Details servicename="ns2c-server" gamename="NS2: Combat" diff --git a/NoMoreRoomInHell/nmrihserver b/NoMoreRoomInHell/nmrihserver index 171f9bfbd..58dc2e024 100644 --- a/NoMoreRoomInHell/nmrihserver +++ b/NoMoreRoomInHell/nmrihserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="130716" +version="160916" #### Variables #### @@ -61,6 +61,11 @@ githubbranch="master" # Steam appid="317670" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta" +branch="" + # Server Details servicename="nmrih-server" gamename="No More Room in Hell" diff --git a/PiratesVikingandKnightsII/pvkiiserver b/PiratesVikingandKnightsII/pvkiiserver index 3c45f30a5..dacaca04a 100644 --- a/PiratesVikingandKnightsII/pvkiiserver +++ b/PiratesVikingandKnightsII/pvkiiserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -56,6 +56,11 @@ githubbranch="master" # Steam appid="17575" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta" +branch="" + # Server Details servicename="pvkii-server" gamename="Pirates, Vikings, and Knights II" diff --git a/ProjectZomboid/pzserver b/ProjectZomboid/pzserver index ed501ac9b..60bf63bee 100644 --- a/ProjectZomboid/pzserver +++ b/ProjectZomboid/pzserver @@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="290716" +version="160916" #### Variables #### @@ -51,8 +51,10 @@ githubbranch="master" # Steam appid="380870" -# Allows for opting into the various Steam branches that PZ has to offer -# Example: -beta iwillbackupmysave -betapassword iaccepttheconsequences + +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta iwillbackupmysave -betapassword iaccepttheconsequences" branch="" # Server Details diff --git a/QuakeLive/qlserver b/QuakeLive/qlserver index 02f621632..586788936 100755 --- a/QuakeLive/qlserver +++ b/QuakeLive/qlserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="060516" +version="160916" #### Variables #### @@ -44,7 +44,7 @@ updateonstart="off" # Install/Config Guide : https://steamcommunity.com/sharedfiles/filedetails/?id=542966946 # Console Commands : http://www.regurge.at/ql/ fn_parms(){ - parms="+set net_strict 1 +set net_ip ${ip} +set net_port ${port} +set fs_homepath ${filesdir}/${port} +set zmq_rcon_enable 1 +set zmq_rcon_port ${rconport} +set zmq_rcon_password ${rconpassword} +set zmq_stats_enable 1 +set zmq_stats_password ${statspassword} +set zmq_stats_port ${statsport} +set sv_mapPoolFile ${mappool} +exec ${servercfg}" +parms="+set net_strict 1 +set net_ip ${ip} +set net_port ${port} +set fs_homepath ${filesdir}/${port} +set zmq_rcon_enable 1 +set zmq_rcon_port ${rconport} +set zmq_rcon_password ${rconpassword} +set zmq_stats_enable 1 +set zmq_stats_password ${statspassword} +set zmq_stats_port ${statsport} +set sv_mapPoolFile ${mappool} +exec ${servercfg}" } #### Advanced Variables #### @@ -59,6 +59,11 @@ githubbranch="master" # Steam appid="349090" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta" +branch="" + # Server Details servicename="ql-server" gamename="Quake Live" diff --git a/Rust/rustserver b/Rust/rustserver index a187b3f4f..8d03b7019 100644 --- a/Rust/rustserver +++ b/Rust/rustserver @@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -73,6 +73,11 @@ githubbranch="master" # Steam appid="258550" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta prerelease" +branch="" + # Server Details servicename="rust-server" gamename="Rust" diff --git a/SeriousSam3BFE/ss3sserver b/SeriousSam3BFE/ss3sserver index c677d0bbc..a3d66ab3e 100644 --- a/SeriousSam3BFE/ss3sserver +++ b/SeriousSam3BFE/ss3sserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -51,6 +51,11 @@ githubbranch="master" # Steam appid="41080" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta publicbeta" +branch="" + # Server Details servicename="ss3-server" gamename="Serious Sam 3: BFE" diff --git a/Starbound/sbserver b/Starbound/sbserver index 6db458b57..3bfd2883c 100644 --- a/Starbound/sbserver +++ b/Starbound/sbserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="230716" +version="160916" #### Variables #### @@ -50,6 +50,11 @@ githubbranch="master" # Steam appid="211820" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta" +branch="" + # Server Details servicename="sb-server" gamename="Starbound" diff --git a/SvenCoop/svencoopserver b/SvenCoop/svencoopserver index c6f7ba086..63667b3eb 100644 --- a/SvenCoop/svencoopserver +++ b/SvenCoop/svencoopserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -55,6 +55,11 @@ githubbranch="master" # Steam appid="276060" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta release_candidate_public" +branch="" + # Server Details servicename="svencoop-server" gamename="Sven Co-op" diff --git a/TeamFortress2/tf2server b/TeamFortress2/tf2server index 6d5062848..f82451360 100644 --- a/TeamFortress2/tf2server +++ b/TeamFortress2/tf2server @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="160916" #### Variables #### @@ -61,6 +61,11 @@ githubbranch="master" # Steam appid="232250" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta beta" +branch="" + # Server Details servicename="tf2-server" gamename="Team Fortress 2" From 05700a0a925fe7f486990100c3091830486b576a Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Sat, 17 Sep 2016 20:15:06 +0200 Subject: [PATCH 6/7] Fixed update command descriptions --- lgsm/functions/core_getopt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh index 5b7042f8c..c42e64746 100644 --- a/lgsm/functions/core_getopt.sh +++ b/lgsm/functions/core_getopt.sh @@ -125,7 +125,7 @@ case "${getopt}" in echo -e "${blue}start\t${default}st |Start the server." echo -e "${blue}stop\t${default}sp |Stop the server." echo -e "${blue}restart\t${default}r |Restart the server." - echo -e "${blue}update\t${default}u |Checks and applies updates from SteamCMD." + echo -e "${blue}update\t${default}u |Checks and applies updates from teamspeak.com." echo -e "${blue}update-functions\t${default}uf |Removes all functions so latest can be downloaded." echo -e "${blue}monitor\t${default}m |Checks that the server is running." echo -e "${blue}test-alert\t${default}ta |Sends test alert." @@ -246,7 +246,7 @@ case "${getopt}" in echo -e "${blue}start\t${default}st |Start the server." echo -e "${blue}stop\t${default}sp |Stop the server." echo -e "${blue}restart\t${default}r |Restart the server." - echo -e "${blue}update\t${default}u |Checks and applies updates from SteamCMD." + echo -e "${blue}update\t${default}u |Checks and applies updates from GitHub." echo -e "${blue}update-functions\t${default}uf |Removes all functions so latest can be downloaded." echo -e "${blue}monitor\t${default}m |Checks that the server is running." echo -e "${blue}test-alert\t${default}ta |Sends test alert." From 4cad03af1fdc0bd7b863285f84220f48cbacf25f Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Sat, 17 Sep 2016 21:04:25 +0200 Subject: [PATCH 7/7] Fixed function names for force-update --- lgsm/functions/check.sh | 2 +- lgsm/functions/core_getopt.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/check.sh b/lgsm/functions/check.sh index 58a3041d7..751652c2f 100644 --- a/lgsm/functions/check.sh +++ b/lgsm/functions/check.sh @@ -25,7 +25,7 @@ do fi done -local allowed_commands_array=( command_backup.sh command_console.sh command_debug.sh command_details.sh command_unreal2_maps.sh command_ut99_maps.sh command_monitor.sh command_start.sh command_stop.sh update_check.sh command_validate.sh command_update_functions.sh command_email_test.sh ) +local allowed_commands_array=( command_backup.sh command_console.sh command_debug.sh command_details.sh command_unreal2_maps.sh command_ut99_maps.sh command_monitor.sh command_start.sh command_stop.sh command_update.sh command_validate.sh command_update_functions.sh command_email_test.sh ) for allowed_command in "${allowed_commands_array[@]}" do if [ "${allowed_command}" == "${function_selfname}" ]; then diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh index c42e64746..3b9140385 100644 --- a/lgsm/functions/core_getopt.sh +++ b/lgsm/functions/core_getopt.sh @@ -269,7 +269,7 @@ case "${getopt}" in command_update.sh;; fu|force-update|update-restart) forceupdate=1; - update_check.sh;; + command_update.sh;; uf|update-functions) command_update_functions.sh;; v|validate) @@ -408,7 +408,7 @@ case "${getopt}" in command_update.sh;; fu|force-update|update-restart) forceupdate=1; - update_check.sh;; + command_update.sh;; uf|update-functions) command_update_functions.sh;; v|validate)