From b845252e4d72e643cca3062a62369dc660da745d Mon Sep 17 00:00:00 2001 From: JATO457 Date: Thu, 3 Nov 2016 21:44:25 -0400 Subject: [PATCH 01/23] Pushbullet Channel Support Adds support to push to channels with alert_pushbullet.sh and strings added to main server files --- 7DaysToDie/sdtdserver | 4 ++++ ARKSurvivalEvolved/arkserver | 4 ++++ Arma3/arma3server | 4 ++++ Battlefield1942/bf1942server | 4 ++++ BlackMesa/bmdmserver | 4 ++++ BladeSymphony/bsserver | 4 ++++ BrainBread2/bb2server | 4 ++++ CallOfDuty/codserver | 4 ++++ CodenameCURE/ccserver | 4 ++++ CounterStrike/csserver | 4 ++++ CounterStrikeConditionZero/csczserver | 4 ++++ CounterStrikeGlobalOffensive/csgoserver | 4 ++++ CounterStrikeSource/cssserver | 4 ++++ DayOfDefeat/dodserver | 4 ++++ DayOfDefeatSource/dodsserver | 4 ++++ DayOfInfamy/doiserver | 4 ++++ DeathmatchClassic/dmcserver | 4 ++++ DontStarveTogether/dstserver | 4 ++++ DoubleActionBoogaloo/dabserver | 4 ++++ EmpiresMod/emserver | 4 ++++ FistfulOfFrags/fofserver | 4 ++++ GarrysMod/gmodserver | 4 ++++ GoldenEyeSource/gesserver | 4 ++++ HalfLife2Deathmatch/hl2dmserver | 4 ++++ HalfLifeDeathmatch/hldmserver | 4 ++++ HalfLifeDeathmatchSource/hldmsserver | 4 ++++ Hurtworld/hwserver | 4 ++++ Insurgency/insserver | 4 ++++ JustCause2/jc2server | 4 ++++ KillingFloor/kfserver | 4 ++++ Left4Dead/l4dserver | 4 ++++ Left4Dead2/l4d2server | 4 ++++ Minecraft/mcserver | 4 ++++ Mumble/mumbleserver | 4 ++++ NS2Combat/ns2cserver | 4 ++++ NaturalSelection2/ns2server | 4 ++++ NoMoreRoomInHell/nmrihserver | 4 ++++ OpposingForce/opforserver | 4 ++++ PiratesVikingandKnightsII/pvkiiserver | 4 ++++ ProjectZomboid/pzserver | 4 ++++ Quake2/q2server | 4 ++++ Quake3/q3server | 4 ++++ QuakeLive/qlserver | 4 ++++ QuakeWorld/qwserver | 4 ++++ RedOrchestra/roserver | 4 ++++ Ricochet/ricochetserver | 4 ++++ Rust/rustserver | 4 ++++ SeriousSam3BFE/ss3sserver | 4 ++++ Starbound/sbserver | 4 ++++ SvenCoop/svenserver | 4 ++++ TeamFortress2/tf2server | 4 ++++ TeamFortressClassic/tfcserver | 4 ++++ TeamSpeak3/ts3server | 4 ++++ Teeworlds/twserver | 4 ++++ Terraria/terrariaserver | 4 ++++ UnrealTournament/utserver | 4 ++++ UnrealTournament2004/ut2k4server | 4 ++++ UnrealTournament3/ut3server | 4 ++++ UnrealTournament99/ut99server | 4 ++++ WolfensteinEnemyTerritory/wetserver | 4 ++++ 60 files changed, 240 insertions(+) diff --git a/7DaysToDie/sdtdserver b/7DaysToDie/sdtdserver index 5825a9248..45128d1a3 100644 --- a/7DaysToDie/sdtdserver +++ b/7DaysToDie/sdtdserver @@ -46,6 +46,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/ARKSurvivalEvolved/arkserver b/ARKSurvivalEvolved/arkserver index f2a9f2641..f582e86c6 100644 --- a/ARKSurvivalEvolved/arkserver +++ b/ARKSurvivalEvolved/arkserver @@ -48,6 +48,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/Arma3/arma3server b/Arma3/arma3server index e4b4fb83b..f9b829c06 100644 --- a/Arma3/arma3server +++ b/Arma3/arma3server @@ -62,6 +62,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/Battlefield1942/bf1942server b/Battlefield1942/bf1942server index 43212f78a..2ad4c2ce8 100644 --- a/Battlefield1942/bf1942server +++ b/Battlefield1942/bf1942server @@ -38,6 +38,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/BlackMesa/bmdmserver b/BlackMesa/bmdmserver index 62bea603e..1c52fad37 100644 --- a/BlackMesa/bmdmserver +++ b/BlackMesa/bmdmserver @@ -52,6 +52,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/BladeSymphony/bsserver b/BladeSymphony/bsserver index 548adea2a..0b528f10c 100644 --- a/BladeSymphony/bsserver +++ b/BladeSymphony/bsserver @@ -51,6 +51,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/BrainBread2/bb2server b/BrainBread2/bb2server index 86c2fc9c8..f40f775e1 100644 --- a/BrainBread2/bb2server +++ b/BrainBread2/bb2server @@ -55,6 +55,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/CallOfDuty/codserver b/CallOfDuty/codserver index ae19879e8..80925c7f0 100755 --- a/CallOfDuty/codserver +++ b/CallOfDuty/codserver @@ -44,6 +44,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" diff --git a/CodenameCURE/ccserver b/CodenameCURE/ccserver index dd622b8ae..f1240b043 100644 --- a/CodenameCURE/ccserver +++ b/CodenameCURE/ccserver @@ -45,6 +45,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/CounterStrike/csserver b/CounterStrike/csserver index bca3e12a3..c2e77e3dd 100644 --- a/CounterStrike/csserver +++ b/CounterStrike/csserver @@ -46,6 +46,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/CounterStrikeConditionZero/csczserver b/CounterStrikeConditionZero/csczserver index 5eb278771..8a3704d09 100644 --- a/CounterStrikeConditionZero/csczserver +++ b/CounterStrikeConditionZero/csczserver @@ -46,6 +46,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver index 8018883b9..3d4b83ba4 100755 --- a/CounterStrikeGlobalOffensive/csgoserver +++ b/CounterStrikeGlobalOffensive/csgoserver @@ -70,6 +70,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver index 78345eb9c..01a94b04d 100644 --- a/CounterStrikeSource/cssserver +++ b/CounterStrikeSource/cssserver @@ -53,6 +53,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/DayOfDefeat/dodserver b/DayOfDefeat/dodserver index e6db43522..0edcd00a2 100644 --- a/DayOfDefeat/dodserver +++ b/DayOfDefeat/dodserver @@ -47,6 +47,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver index 8386384b6..7e88b8aaf 100644 --- a/DayOfDefeatSource/dodsserver +++ b/DayOfDefeatSource/dodsserver @@ -47,6 +47,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/DayOfInfamy/doiserver b/DayOfInfamy/doiserver index d39568a53..76d03d0b4 100644 --- a/DayOfInfamy/doiserver +++ b/DayOfInfamy/doiserver @@ -49,6 +49,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/DeathmatchClassic/dmcserver b/DeathmatchClassic/dmcserver index d2be5c1be..024a9821c 100644 --- a/DeathmatchClassic/dmcserver +++ b/DeathmatchClassic/dmcserver @@ -46,6 +46,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/DontStarveTogether/dstserver b/DontStarveTogether/dstserver index 5b9a5c112..316b56287 100644 --- a/DontStarveTogether/dstserver +++ b/DontStarveTogether/dstserver @@ -45,6 +45,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/DoubleActionBoogaloo/dabserver b/DoubleActionBoogaloo/dabserver index c080c568a..c7a8610b0 100644 --- a/DoubleActionBoogaloo/dabserver +++ b/DoubleActionBoogaloo/dabserver @@ -47,6 +47,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/EmpiresMod/emserver b/EmpiresMod/emserver index 6c2fa539c..abcd6aaf3 100644 --- a/EmpiresMod/emserver +++ b/EmpiresMod/emserver @@ -31,6 +31,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/FistfulOfFrags/fofserver b/FistfulOfFrags/fofserver index 7dc5cc571..673e3ed11 100644 --- a/FistfulOfFrags/fofserver +++ b/FistfulOfFrags/fofserver @@ -47,6 +47,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/GarrysMod/gmodserver b/GarrysMod/gmodserver index 1bbba189c..ff1a543fd 100644 --- a/GarrysMod/gmodserver +++ b/GarrysMod/gmodserver @@ -62,6 +62,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/GoldenEyeSource/gesserver b/GoldenEyeSource/gesserver index 7dd85e2f6..3c4876282 100644 --- a/GoldenEyeSource/gesserver +++ b/GoldenEyeSource/gesserver @@ -47,6 +47,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/HalfLife2Deathmatch/hl2dmserver b/HalfLife2Deathmatch/hl2dmserver index 6b0489fe6..5d9b95044 100644 --- a/HalfLife2Deathmatch/hl2dmserver +++ b/HalfLife2Deathmatch/hl2dmserver @@ -47,6 +47,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/HalfLifeDeathmatch/hldmserver b/HalfLifeDeathmatch/hldmserver index 43e3bf106..71e32297c 100644 --- a/HalfLifeDeathmatch/hldmserver +++ b/HalfLifeDeathmatch/hldmserver @@ -46,6 +46,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/HalfLifeDeathmatchSource/hldmsserver b/HalfLifeDeathmatchSource/hldmsserver index 07b2c24cf..b1f2fdef5 100644 --- a/HalfLifeDeathmatchSource/hldmsserver +++ b/HalfLifeDeathmatchSource/hldmsserver @@ -47,6 +47,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/Hurtworld/hwserver b/Hurtworld/hwserver index d63e5a346..a4eb88765 100644 --- a/Hurtworld/hwserver +++ b/Hurtworld/hwserver @@ -59,6 +59,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/Insurgency/insserver b/Insurgency/insserver index 6a2748478..55d26c844 100644 --- a/Insurgency/insserver +++ b/Insurgency/insserver @@ -49,6 +49,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/JustCause2/jc2server b/JustCause2/jc2server index 4c89b31c1..2d6457644 100644 --- a/JustCause2/jc2server +++ b/JustCause2/jc2server @@ -41,6 +41,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/KillingFloor/kfserver b/KillingFloor/kfserver index 5f0e44154..8610e50ed 100644 --- a/KillingFloor/kfserver +++ b/KillingFloor/kfserver @@ -49,6 +49,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/Left4Dead/l4dserver b/Left4Dead/l4dserver index 2a7a20be1..8382b3ac5 100644 --- a/Left4Dead/l4dserver +++ b/Left4Dead/l4dserver @@ -46,6 +46,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server index 0a84f1d83..2f6c0a487 100644 --- a/Left4Dead2/l4d2server +++ b/Left4Dead2/l4d2server @@ -46,6 +46,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/Minecraft/mcserver b/Minecraft/mcserver index ab69b9010..4b9c4549e 100644 --- a/Minecraft/mcserver +++ b/Minecraft/mcserver @@ -41,6 +41,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/Mumble/mumbleserver b/Mumble/mumbleserver index ace1dac08..6ec84b238 100644 --- a/Mumble/mumbleserver +++ b/Mumble/mumbleserver @@ -40,6 +40,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/NS2Combat/ns2cserver b/NS2Combat/ns2cserver index 460ce874c..20dcf5542 100644 --- a/NS2Combat/ns2cserver +++ b/NS2Combat/ns2cserver @@ -58,6 +58,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/NaturalSelection2/ns2server b/NaturalSelection2/ns2server index 741f37862..64b77b84b 100644 --- a/NaturalSelection2/ns2server +++ b/NaturalSelection2/ns2server @@ -58,6 +58,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/NoMoreRoomInHell/nmrihserver b/NoMoreRoomInHell/nmrihserver index d5910ab44..7ed8680dc 100644 --- a/NoMoreRoomInHell/nmrihserver +++ b/NoMoreRoomInHell/nmrihserver @@ -52,6 +52,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/OpposingForce/opforserver b/OpposingForce/opforserver index 1c059ed6b..bec0c07b5 100644 --- a/OpposingForce/opforserver +++ b/OpposingForce/opforserver @@ -46,6 +46,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/PiratesVikingandKnightsII/pvkiiserver b/PiratesVikingandKnightsII/pvkiiserver index bc7767adb..2a0d8d185 100644 --- a/PiratesVikingandKnightsII/pvkiiserver +++ b/PiratesVikingandKnightsII/pvkiiserver @@ -47,6 +47,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/ProjectZomboid/pzserver b/ProjectZomboid/pzserver index 0586a2c13..2936d0e83 100644 --- a/ProjectZomboid/pzserver +++ b/ProjectZomboid/pzserver @@ -41,6 +41,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/Quake2/q2server b/Quake2/q2server index 94de84180..c510e5bb6 100644 --- a/Quake2/q2server +++ b/Quake2/q2server @@ -42,6 +42,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" diff --git a/Quake3/q3server b/Quake3/q3server index c302f10c0..5a0dd4e71 100644 --- a/Quake3/q3server +++ b/Quake3/q3server @@ -43,6 +43,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" diff --git a/QuakeLive/qlserver b/QuakeLive/qlserver index 33cc3696c..d0ad9a6f3 100755 --- a/QuakeLive/qlserver +++ b/QuakeLive/qlserver @@ -50,6 +50,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/QuakeWorld/qwserver b/QuakeWorld/qwserver index 78449e81f..b6f7d27a9 100644 --- a/QuakeWorld/qwserver +++ b/QuakeWorld/qwserver @@ -24,6 +24,10 @@ email="email@example.com" # https://www.pushbullet.com/#settings pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" # Start Variables ip="0.0.0.0" diff --git a/RedOrchestra/roserver b/RedOrchestra/roserver index 025bf348c..aa6101c04 100644 --- a/RedOrchestra/roserver +++ b/RedOrchestra/roserver @@ -47,6 +47,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/Ricochet/ricochetserver b/Ricochet/ricochetserver index 8eb18e0c1..0050db4ef 100644 --- a/Ricochet/ricochetserver +++ b/Ricochet/ricochetserver @@ -70,6 +70,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/Rust/rustserver b/Rust/rustserver index 0ac0ab260..c43b968b7 100644 --- a/Rust/rustserver +++ b/Rust/rustserver @@ -62,6 +62,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/SeriousSam3BFE/ss3sserver b/SeriousSam3BFE/ss3sserver index f0b1181e9..d917a1df8 100644 --- a/SeriousSam3BFE/ss3sserver +++ b/SeriousSam3BFE/ss3sserver @@ -42,6 +42,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/Starbound/sbserver b/Starbound/sbserver index dd5e70e4e..8ac7300f9 100644 --- a/Starbound/sbserver +++ b/Starbound/sbserver @@ -46,6 +46,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/SvenCoop/svenserver b/SvenCoop/svenserver index 82101fefa..60ee59f06 100644 --- a/SvenCoop/svenserver +++ b/SvenCoop/svenserver @@ -46,6 +46,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/TeamFortress2/tf2server b/TeamFortress2/tf2server index 5adfaa87b..678a01fcf 100644 --- a/TeamFortress2/tf2server +++ b/TeamFortress2/tf2server @@ -50,6 +50,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/TeamFortressClassic/tfcserver b/TeamFortressClassic/tfcserver index 8b6994e4a..b399cd1c9 100644 --- a/TeamFortressClassic/tfcserver +++ b/TeamFortressClassic/tfcserver @@ -46,6 +46,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/TeamSpeak3/ts3server b/TeamSpeak3/ts3server index f0bfbb8ea..b69d3e01b 100644 --- a/TeamSpeak3/ts3server +++ b/TeamSpeak3/ts3server @@ -34,6 +34,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/Teeworlds/twserver b/Teeworlds/twserver index bae6a0427..a0170ed30 100644 --- a/Teeworlds/twserver +++ b/Teeworlds/twserver @@ -46,6 +46,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/Terraria/terrariaserver b/Terraria/terrariaserver index a7b2b6c8b..31420b488 100644 --- a/Terraria/terrariaserver +++ b/Terraria/terrariaserver @@ -46,6 +46,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/UnrealTournament/utserver b/UnrealTournament/utserver index d011b93ad..e4e6415f6 100644 --- a/UnrealTournament/utserver +++ b/UnrealTournament/utserver @@ -48,6 +48,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" diff --git a/UnrealTournament2004/ut2k4server b/UnrealTournament2004/ut2k4server index c8c1f55ee..0e196368a 100644 --- a/UnrealTournament2004/ut2k4server +++ b/UnrealTournament2004/ut2k4server @@ -43,6 +43,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" diff --git a/UnrealTournament3/ut3server b/UnrealTournament3/ut3server index b65b633bb..22f5cb2db 100644 --- a/UnrealTournament3/ut3server +++ b/UnrealTournament3/ut3server @@ -54,6 +54,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" diff --git a/UnrealTournament99/ut99server b/UnrealTournament99/ut99server index 8787df657..516e87b99 100644 --- a/UnrealTournament99/ut99server +++ b/UnrealTournament99/ut99server @@ -43,6 +43,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" diff --git a/WolfensteinEnemyTerritory/wetserver b/WolfensteinEnemyTerritory/wetserver index c4a5a0db8..3052e29f8 100644 --- a/WolfensteinEnemyTerritory/wetserver +++ b/WolfensteinEnemyTerritory/wetserver @@ -42,6 +42,10 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +# Pushbullet Channel | Do not set unless the channel exists on the +# account associated with the access token. Set without using the '#' +# E.g: "thisisachanneltag" would push to #thisisachanneltag +channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 20de638b793b04152d1c76be987508fc4ea4ff59 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Mon, 7 Nov 2016 19:33:50 +0100 Subject: [PATCH 02/23] hotfix for ts3 server pass Issue: other functions were triggering core_exit.sh Fix: bypass them bonus: better output Sample output: http://hastebin.com/quxulezila.rb --- lgsm/functions/command_ts3_server_pass.sh | 26 ++++++++++++----------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh index 89c3cd036..1a9896889 100644 --- a/lgsm/functions/command_ts3_server_pass.sh +++ b/lgsm/functions/command_ts3_server_pass.sh @@ -29,22 +29,17 @@ fn_serveradmin_password_prompt(){ done fn_script_log_info "Initiating ${gamename} ServerAdmin password change" read -p "Enter new password : " newpassword - } +} - fn_serveradmin_password_set(){ - fn_print_info_nl "Applying new password" - fn_script_log_info "Applying new password" +fn_serveradmin_password_set(){ + fn_print_info_nl "Starting server with new password..." + fn_script_log_info "Starting server with new password" sleep 1 - # Stop any running server - command_stop.sh # Start server in "new password mode" ts3serverpass="1" - fn_print_info_nl "Starting server with new password" + exitbypass="1" command_start.sh - # Stop server in "new password mode" - command_stop.sh - ts3serverpass="0" fn_print_ok_nl "Password applied" fn_script_log_pass "New ServerAdmin password applied" sleep 1 @@ -55,9 +50,16 @@ check.sh fn_serveradmin_password_prompt check_status.sh if [ "${status}" != "0" ]; then + # Stop any running server + exitbypass="1" + command_stop.sh fn_serveradmin_password_set - command_start.sh + ts3serverpass="0" + fn_print_info_nl "Restarting server normally" + fn_script_log_info "Restarting server normally" + command_restart.sh else fn_serveradmin_password_set + command_stop.sh fi -core_exit.sh \ No newline at end of file +core_exit.sh From ee6c6c920ec80317d0508a322904120a0b3e349f Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Mon, 7 Nov 2016 19:34:42 +0100 Subject: [PATCH 03/23] hotfix for ts3 server pass --- lgsm/functions/command_start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh index 57dcbfa60..30bbfccc8 100644 --- a/lgsm/functions/command_start.sh +++ b/lgsm/functions/command_start.sh @@ -37,7 +37,7 @@ fn_start_teamspeak3(){ date > "${rootdir}/${lockselfname}" cd "${executabledir}" if [ "${ts3serverpass}" == "1" ];then - ./ts3server_startscript.sh start serveradmin_password="${newpassword}" inifile="${servercfgfullpath}" + ./ts3server_startscript.sh start serveradmin_password="${newpassword}" inifile="${servercfgfullpath}" > /dev/null 2>&1 else ./ts3server_startscript.sh start inifile="${servercfgfullpath}" > /dev/null 2>&1 fi From ade6d66a18b6c47bc5aa0187ef2d9060c6903fae Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Wed, 9 Nov 2016 01:34:54 +0100 Subject: [PATCH 04/23] executable hotfix for Rust | fixes #1171 --- Rust/rustserver | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Rust/rustserver b/Rust/rustserver index 0ac0ab260..870f42d04 100644 --- a/Rust/rustserver +++ b/Rust/rustserver @@ -116,7 +116,7 @@ filesdir="${rootdir}/serverfiles" ## Server Specific Directories systemdir="${filesdir}" executabledir="${filesdir}" -executable="./RustDedicated" +executable="LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`dirname $0`/RustDedicated_Data/Plugins/x86_64 ./RustDedicated" serveridentitydir="${systemdir}/server/${servicename}" servercfg="server.cfg" servercfgdefault="server.cfg" @@ -214,4 +214,4 @@ fi core_dl.sh core_functions.sh getopt=$1 -core_getopt.sh \ No newline at end of file +core_getopt.sh From 059cac1a0f86f1a53a9d1ee4dfddad8503caa946 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 13 Nov 2016 00:18:45 +0000 Subject: [PATCH 05/23] Corrected game name --- JustCause2/jc2server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JustCause2/jc2server b/JustCause2/jc2server index 4c89b31c1..e44781300 100644 --- a/JustCause2/jc2server +++ b/JustCause2/jc2server @@ -3,7 +3,7 @@ # Project: Game Server Managers - LinuxGSM # Author: Daniel Gibbs # License: MIT License, Copyright (c) 2016 Daniel Gibbs -# Purpose: GAMENAME | Server Management Script +# Purpose: Just Cause 2 | Server Management Script # Contributors: https://github.com/GameServerManagers/LinuxGSM/graphs/contributors # Documentation: https://github.com/GameServerManagers/LinuxGSM/wiki # Website: https://gameservermanagers.com From efcbc84a6339602bd11b2702f346965a9d35543a Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 13 Nov 2016 00:20:41 +0000 Subject: [PATCH 06/23] Updated test with new style --- tests/tests_jc2server.sh | 113 +++++++++++++++++++++++++++------------ 1 file changed, 79 insertions(+), 34 deletions(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 7a6b62b5d..47863d0dd 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -1,60 +1,90 @@ #!/bin/bash -# TravisCI Tests: Just Cause 2 -# Server Management Script +# Just Cause 2 +# Project: Game Server Managers - LinuxGSM # Author: Daniel Gibbs +# License: MIT License, Copyright (c) 2016 Daniel Gibbs +# Purpose: TravisCI Test: Just Cause 2 | Server Management Script +# Contributors: https://github.com/GameServerManagers/LinuxGSM/graphs/contributors +# Documentation: https://github.com/GameServerManagers/LinuxGSM/wiki # Website: https://gameservermanagers.com + version="101716" +# Debugging if [ -f ".dev-debug" ]; then exec 5>dev-debug.log BASH_XTRACEFD="5" set -x fi -#### Variables #### +version="161030" -# Notification Alerts -# (on|off) +########################## +######## Settings ######## +########################## + +#### Server Settings #### +# No settings available for Just Cause 2 + +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters +# Edit with care +fn_parms(){ +parms="" +} + +#### LinuxGSM Settings #### -# Email +## Notification Alerts +# (on|off) +# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email emailalert="off" email="email@example.com" -#emailfrom="email@example.com" - -# Pushbullet -# https://www.pushbullet.com/#settings +emailfrom="" +# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Steam login -steamuser="anonymous" -steampass="" - -# Start Variables +## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" -fn_parms(){ -parms="" -} +## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" -#### Advanced Variables #### +## Logging | https://github.com/GameServerManagers/LinuxGSM/wiki/Logging +consolelogging="on" +logdays="7" + +#### LinuxGSM Advanced Settings #### + +## SteamCMD Settings +# Server appid +appid="261140" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta latest_experimental" +branch="" -# Github Branch Select +## Github Branch Select # Allows for the use of different function files # from a different repo and/or branch. githubuser="GameServerManagers" githubrepo="LinuxGSM" githubbranch="$TRAVIS_BRANCH" -# Steam -appid="261140" - -# Server Details -servicename="jc2-server" +## LinuxGSM Server Details +# Do not edit gamename="Just Cause 2" engine="avalanche" -# Directories +## Service Name | https://github.com/GameServerManagers/LinuxGSM/wiki/Multiple-Servers +servicename="jc2-server" + +#### Directories #### +# Edit with care + +## Work Directories rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))" selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" lockselfname=".${servicename}.lock" @@ -63,6 +93,8 @@ functionsdir="${lgsmdir}/functions" libdir="${lgsmdir}/lib" tmpdir="${lgsmdir}/tmp" filesdir="${rootdir}/serverfiles" + +## Server Specific Directories systemdir="${filesdir}" executabledir="${filesdir}" executable="./Jcmp-Server" @@ -70,24 +102,26 @@ servercfg="config.lua" servercfgdefault="config.lua" servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +## Backup Directory backupdir="${rootdir}/backups" -# Logging -logdays="7" +## Logging Directories #gamelogdir="" # No server logs available scriptlogdir="${rootdir}/log/script" consolelogdir="${rootdir}/log/console" -consolelogging="on" - scriptlog="${scriptlogdir}/${servicename}-script.log" consolelog="${consolelogdir}/${servicename}-console.log" emaillog="${scriptlogdir}/${servicename}-email.log" -scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%d-%m-%Y-%H-%M-%S').log" -consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M-%S').log" +## Logs Naming +scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" -##### Script ##### -# Do not edit +######################## +######## Script ######## +###### Do not edit ##### +######################## # Fetches core_dl for file downloads fn_fetch_core_dl(){ @@ -144,6 +178,17 @@ functionfile="${FUNCNAME}" fn_fetch_core_dl } +# Prevent from running this script as root. +if [ "$(whoami)" = "root" ]; then + if [ ! -f "${functionsdir}/core_functions.sh" ]||[ ! -f "${functionsdir}/check_root.sh" ]||[ ! -f "${functionsdir}/core_messages.sh" ]||[ ! -f "${functionsdir}/core_exit.sh" ]; then + echo "[ FAIL ] Do NOT run this script as root!" + exit 1 + else + core_functions.sh + check_root.sh + fi +fi + core_dl.sh core_functions.sh From 9a93dc3d2f4bae16558b948198df0de6fadd4496 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 13 Nov 2016 00:46:06 +0000 Subject: [PATCH 08/23] Release number updated --- 7DaysToDie/sdtdserver | 2 +- ARKSurvivalEvolved/arkserver | 2 +- Arma3/arma3server | 2 +- Battlefield1942/bf1942server | 2 +- BlackMesa/bmdmserver | 2 +- BladeSymphony/bsserver | 2 +- BrainBread2/bb2server | 2 +- CallOfDuty/codserver | 2 +- CallOfDuty2/cod2server | 2 +- CodenameCURE/ccserver | 2 +- CounterStrike/csserver | 2 +- CounterStrikeConditionZero/csczserver | 2 +- CounterStrikeGlobalOffensive/csgoserver | 2 +- CounterStrikeSource/cssserver | 2 +- DayOfDefeat/dodserver | 2 +- DayOfDefeatSource/dodsserver | 2 +- DayOfInfamy/doiserver | 2 +- DeathmatchClassic/dmcserver | 2 +- DontStarveTogether/dstserver | 2 +- DoubleActionBoogaloo/dabserver | 2 +- FistfulOfFrags/fofserver | 2 +- GarrysMod/gmodserver | 2 +- GoldenEyeSource/gesserver | 2 +- HalfLife2Deathmatch/hl2dmserver | 2 +- HalfLifeDeathmatch/hldmserver | 2 +- HalfLifeDeathmatchSource/hldmsserver | 2 +- Hurtworld/hwserver | 2 +- Insurgency/insserver | 2 +- JustCause2/jc2server | 2 +- KillingFloor/kfserver | 2 +- Left4Dead/l4dserver | 2 +- Left4Dead2/l4d2server | 2 +- Minecraft/mcserver | 2 +- Mumble/mumbleserver | 2 +- NS2Combat/ns2cserver | 2 +- NaturalSelection2/ns2server | 2 +- NoMoreRoomInHell/nmrihserver | 2 +- OpposingForce/opforserver | 2 +- PiratesVikingandKnightsII/pvkiiserver | 2 +- ProjectZomboid/pzserver | 2 +- Quake2/q2server | 2 +- Quake3/q3server | 2 +- QuakeLive/qlserver | 2 +- RedOrchestra/roserver | 2 +- Ricochet/ricochetserver | 2 +- Rust/rustserver | 2 +- SeriousSam3BFE/ss3sserver | 2 +- Starbound/sbserver | 2 +- SvenCoop/svenserver | 2 +- TeamFortress2/tf2server | 2 +- TeamFortressClassic/tfcserver | 2 +- TeamSpeak3/ts3server | 2 +- Teeworlds/twserver | 2 +- Terraria/terrariaserver | 2 +- UnrealTournament/utserver | 2 +- UnrealTournament2004/ut2k4server | 2 +- UnrealTournament3/ut3server | 2 +- UnrealTournament99/ut99server | 2 +- WolfensteinEnemyTerritory/wetserver | 2 +- tests/tests_jc2server.sh | 2 +- 60 files changed, 60 insertions(+), 60 deletions(-) diff --git a/7DaysToDie/sdtdserver b/7DaysToDie/sdtdserver index 5825a9248..67607e35a 100644 --- a/7DaysToDie/sdtdserver +++ b/7DaysToDie/sdtdserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/ARKSurvivalEvolved/arkserver b/ARKSurvivalEvolved/arkserver index f2a9f2641..c2b30ab09 100644 --- a/ARKSurvivalEvolved/arkserver +++ b/ARKSurvivalEvolved/arkserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Arma3/arma3server b/Arma3/arma3server index e4b4fb83b..9fd409b21 100644 --- a/Arma3/arma3server +++ b/Arma3/arma3server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Battlefield1942/bf1942server b/Battlefield1942/bf1942server index 43212f78a..4f715a224 100644 --- a/Battlefield1942/bf1942server +++ b/Battlefield1942/bf1942server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/BlackMesa/bmdmserver b/BlackMesa/bmdmserver index 62bea603e..e55044e5d 100644 --- a/BlackMesa/bmdmserver +++ b/BlackMesa/bmdmserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/BladeSymphony/bsserver b/BladeSymphony/bsserver index 548adea2a..be7aa2266 100644 --- a/BladeSymphony/bsserver +++ b/BladeSymphony/bsserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/BrainBread2/bb2server b/BrainBread2/bb2server index 86c2fc9c8..b23bd5f31 100644 --- a/BrainBread2/bb2server +++ b/BrainBread2/bb2server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/CallOfDuty/codserver b/CallOfDuty/codserver index ae19879e8..497a00cd3 100755 --- a/CallOfDuty/codserver +++ b/CallOfDuty/codserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/CallOfDuty2/cod2server b/CallOfDuty2/cod2server index 74aafdb55..58214c9c4 100755 --- a/CallOfDuty2/cod2server +++ b/CallOfDuty2/cod2server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/CodenameCURE/ccserver b/CodenameCURE/ccserver index dd622b8ae..b9682f910 100644 --- a/CodenameCURE/ccserver +++ b/CodenameCURE/ccserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/CounterStrike/csserver b/CounterStrike/csserver index bca3e12a3..5c9906da3 100644 --- a/CounterStrike/csserver +++ b/CounterStrike/csserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/CounterStrikeConditionZero/csczserver b/CounterStrikeConditionZero/csczserver index 5eb278771..75da8b7b8 100644 --- a/CounterStrikeConditionZero/csczserver +++ b/CounterStrikeConditionZero/csczserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver index 8018883b9..1dded9f29 100755 --- a/CounterStrikeGlobalOffensive/csgoserver +++ b/CounterStrikeGlobalOffensive/csgoserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver index 78345eb9c..857faf6f0 100644 --- a/CounterStrikeSource/cssserver +++ b/CounterStrikeSource/cssserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/DayOfDefeat/dodserver b/DayOfDefeat/dodserver index e6db43522..ead2232d4 100644 --- a/DayOfDefeat/dodserver +++ b/DayOfDefeat/dodserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver index 8386384b6..abe4ab056 100644 --- a/DayOfDefeatSource/dodsserver +++ b/DayOfDefeatSource/dodsserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/DayOfInfamy/doiserver b/DayOfInfamy/doiserver index d39568a53..1aac2bb8c 100644 --- a/DayOfInfamy/doiserver +++ b/DayOfInfamy/doiserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/DeathmatchClassic/dmcserver b/DeathmatchClassic/dmcserver index d2be5c1be..d5c594bde 100644 --- a/DeathmatchClassic/dmcserver +++ b/DeathmatchClassic/dmcserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/DontStarveTogether/dstserver b/DontStarveTogether/dstserver index 5b9a5c112..99493668f 100644 --- a/DontStarveTogether/dstserver +++ b/DontStarveTogether/dstserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/DoubleActionBoogaloo/dabserver b/DoubleActionBoogaloo/dabserver index c080c568a..088b45695 100644 --- a/DoubleActionBoogaloo/dabserver +++ b/DoubleActionBoogaloo/dabserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/FistfulOfFrags/fofserver b/FistfulOfFrags/fofserver index 7dc5cc571..dc74a2534 100644 --- a/FistfulOfFrags/fofserver +++ b/FistfulOfFrags/fofserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/GarrysMod/gmodserver b/GarrysMod/gmodserver index 1bbba189c..adeef431c 100644 --- a/GarrysMod/gmodserver +++ b/GarrysMod/gmodserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/GoldenEyeSource/gesserver b/GoldenEyeSource/gesserver index 7dd85e2f6..bc44ae33c 100644 --- a/GoldenEyeSource/gesserver +++ b/GoldenEyeSource/gesserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/HalfLife2Deathmatch/hl2dmserver b/HalfLife2Deathmatch/hl2dmserver index 6b0489fe6..a6ab0634e 100644 --- a/HalfLife2Deathmatch/hl2dmserver +++ b/HalfLife2Deathmatch/hl2dmserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/HalfLifeDeathmatch/hldmserver b/HalfLifeDeathmatch/hldmserver index 43e3bf106..b9f1e2432 100644 --- a/HalfLifeDeathmatch/hldmserver +++ b/HalfLifeDeathmatch/hldmserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/HalfLifeDeathmatchSource/hldmsserver b/HalfLifeDeathmatchSource/hldmsserver index 07b2c24cf..b1e2b02e6 100644 --- a/HalfLifeDeathmatchSource/hldmsserver +++ b/HalfLifeDeathmatchSource/hldmsserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Hurtworld/hwserver b/Hurtworld/hwserver index d63e5a346..80fca576c 100644 --- a/Hurtworld/hwserver +++ b/Hurtworld/hwserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Insurgency/insserver b/Insurgency/insserver index 6a2748478..4ba642794 100644 --- a/Insurgency/insserver +++ b/Insurgency/insserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/JustCause2/jc2server b/JustCause2/jc2server index e44781300..5bc7b3623 100644 --- a/JustCause2/jc2server +++ b/JustCause2/jc2server @@ -15,7 +15,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/KillingFloor/kfserver b/KillingFloor/kfserver index 5f0e44154..f2253d707 100644 --- a/KillingFloor/kfserver +++ b/KillingFloor/kfserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Left4Dead/l4dserver b/Left4Dead/l4dserver index 2a7a20be1..fc1278113 100644 --- a/Left4Dead/l4dserver +++ b/Left4Dead/l4dserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server index 0a84f1d83..ba9da4f91 100644 --- a/Left4Dead2/l4d2server +++ b/Left4Dead2/l4d2server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Minecraft/mcserver b/Minecraft/mcserver index ab69b9010..d0f77e5cd 100644 --- a/Minecraft/mcserver +++ b/Minecraft/mcserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Mumble/mumbleserver b/Mumble/mumbleserver index ace1dac08..7d83cf15d 100644 --- a/Mumble/mumbleserver +++ b/Mumble/mumbleserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/NS2Combat/ns2cserver b/NS2Combat/ns2cserver index 460ce874c..5b50fdfff 100644 --- a/NS2Combat/ns2cserver +++ b/NS2Combat/ns2cserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/NaturalSelection2/ns2server b/NaturalSelection2/ns2server index 741f37862..7e4c34514 100644 --- a/NaturalSelection2/ns2server +++ b/NaturalSelection2/ns2server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/NoMoreRoomInHell/nmrihserver b/NoMoreRoomInHell/nmrihserver index d5910ab44..65e220b5f 100644 --- a/NoMoreRoomInHell/nmrihserver +++ b/NoMoreRoomInHell/nmrihserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/OpposingForce/opforserver b/OpposingForce/opforserver index 1c059ed6b..e3db2a701 100644 --- a/OpposingForce/opforserver +++ b/OpposingForce/opforserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/PiratesVikingandKnightsII/pvkiiserver b/PiratesVikingandKnightsII/pvkiiserver index bc7767adb..32310d7f3 100644 --- a/PiratesVikingandKnightsII/pvkiiserver +++ b/PiratesVikingandKnightsII/pvkiiserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/ProjectZomboid/pzserver b/ProjectZomboid/pzserver index 0586a2c13..10fc6066c 100644 --- a/ProjectZomboid/pzserver +++ b/ProjectZomboid/pzserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Quake2/q2server b/Quake2/q2server index 94de84180..8bdbbeba1 100644 --- a/Quake2/q2server +++ b/Quake2/q2server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Quake3/q3server b/Quake3/q3server index c302f10c0..ec403b301 100644 --- a/Quake3/q3server +++ b/Quake3/q3server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/QuakeLive/qlserver b/QuakeLive/qlserver index 33cc3696c..95dfee65a 100755 --- a/QuakeLive/qlserver +++ b/QuakeLive/qlserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/RedOrchestra/roserver b/RedOrchestra/roserver index 025bf348c..c62ae3144 100644 --- a/RedOrchestra/roserver +++ b/RedOrchestra/roserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Ricochet/ricochetserver b/Ricochet/ricochetserver index 8eb18e0c1..fb1b9c828 100644 --- a/Ricochet/ricochetserver +++ b/Ricochet/ricochetserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Rust/rustserver b/Rust/rustserver index 0ac0ab260..6f34fadc3 100644 --- a/Rust/rustserver +++ b/Rust/rustserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/SeriousSam3BFE/ss3sserver b/SeriousSam3BFE/ss3sserver index f0b1181e9..756782b71 100644 --- a/SeriousSam3BFE/ss3sserver +++ b/SeriousSam3BFE/ss3sserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Starbound/sbserver b/Starbound/sbserver index dd5e70e4e..b27081421 100644 --- a/Starbound/sbserver +++ b/Starbound/sbserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/SvenCoop/svenserver b/SvenCoop/svenserver index 82101fefa..193efdd9a 100644 --- a/SvenCoop/svenserver +++ b/SvenCoop/svenserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/TeamFortress2/tf2server b/TeamFortress2/tf2server index 5adfaa87b..e9343bd63 100644 --- a/TeamFortress2/tf2server +++ b/TeamFortress2/tf2server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/TeamFortressClassic/tfcserver b/TeamFortressClassic/tfcserver index 8b6994e4a..d5caad15a 100644 --- a/TeamFortressClassic/tfcserver +++ b/TeamFortressClassic/tfcserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/TeamSpeak3/ts3server b/TeamSpeak3/ts3server index f0bfbb8ea..d400f191f 100644 --- a/TeamSpeak3/ts3server +++ b/TeamSpeak3/ts3server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Teeworlds/twserver b/Teeworlds/twserver index bae6a0427..65acc8168 100644 --- a/Teeworlds/twserver +++ b/Teeworlds/twserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Terraria/terrariaserver b/Terraria/terrariaserver index a7b2b6c8b..fb143b6ef 100644 --- a/Terraria/terrariaserver +++ b/Terraria/terrariaserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/UnrealTournament/utserver b/UnrealTournament/utserver index d011b93ad..f2383df8f 100644 --- a/UnrealTournament/utserver +++ b/UnrealTournament/utserver @@ -15,7 +15,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/UnrealTournament2004/ut2k4server b/UnrealTournament2004/ut2k4server index c8c1f55ee..56d61b464 100644 --- a/UnrealTournament2004/ut2k4server +++ b/UnrealTournament2004/ut2k4server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/UnrealTournament3/ut3server b/UnrealTournament3/ut3server index b65b633bb..a9ec44cf8 100644 --- a/UnrealTournament3/ut3server +++ b/UnrealTournament3/ut3server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/UnrealTournament99/ut99server b/UnrealTournament99/ut99server index 8787df657..6ccecea9a 100644 --- a/UnrealTournament99/ut99server +++ b/UnrealTournament99/ut99server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/WolfensteinEnemyTerritory/wetserver b/WolfensteinEnemyTerritory/wetserver index c4a5a0db8..1364157b9 100644 --- a/WolfensteinEnemyTerritory/wetserver +++ b/WolfensteinEnemyTerritory/wetserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 47863d0dd..a7886d81e 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -17,7 +17,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## From 91fd6952e44770466b18beea0e04f8346f73d871 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 13 Nov 2016 00:58:59 +0000 Subject: [PATCH 09/23] fix_cod2.sh not required --- lgsm/functions/core_functions.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh index 765b95712..f5ba4ce9e 100644 --- a/lgsm/functions/core_functions.sh +++ b/lgsm/functions/core_functions.sh @@ -544,11 +544,6 @@ functionfile="${FUNCNAME}" fn_fetch_function } -fix_cod2.sh(){ -functionfile="${FUNCNAME}" -fn_fetch_function -} - # Calls the global Ctrl-C trap core_trap.sh From cd6d644272c6935ed48c09a2b4a389cd7c583447 Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Sun, 13 Nov 2016 16:43:22 +0100 Subject: [PATCH 10/23] Corrected name of Starbound config --- lgsm/functions/install_config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 57fcb7855..872618c1e 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -348,7 +348,7 @@ elif [ "${gamename}" == "Serious Sam 3: BFE" ]; then fn_set_config_vars elif [ "${gamename}" == "Starbound" ]; then gamedirname="Starbound" - array_configs+=( starbound.config ) + array_configs+=( starbound_server.config ) fn_fetch_default_config fn_default_config_remote fn_set_config_vars @@ -417,4 +417,4 @@ elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then fn_fetch_default_config fn_default_config_remote fn_set_config_vars -fi \ No newline at end of file +fi From cf1584ebe84a8ef447b91bc2731550c056e89ed4 Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Sun, 13 Nov 2016 16:43:22 +0100 Subject: [PATCH 11/23] Corrected name of Starbound config --- lgsm/functions/install_config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 57fcb7855..872618c1e 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -348,7 +348,7 @@ elif [ "${gamename}" == "Serious Sam 3: BFE" ]; then fn_set_config_vars elif [ "${gamename}" == "Starbound" ]; then gamedirname="Starbound" - array_configs+=( starbound.config ) + array_configs+=( starbound_server.config ) fn_fetch_default_config fn_default_config_remote fn_set_config_vars @@ -417,4 +417,4 @@ elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then fn_fetch_default_config fn_default_config_remote fn_set_config_vars -fi \ No newline at end of file +fi From c6f5aed2c17f38580108d2d8c0aeb511eba87248 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 13 Nov 2016 20:55:01 +0000 Subject: [PATCH 12/23] Added config.lua for jc2 test --- tests/config.lua | 180 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 tests/config.lua diff --git a/tests/config.lua b/tests/config.lua new file mode 100644 index 000000000..ade07d0ee --- /dev/null +++ b/tests/config.lua @@ -0,0 +1,180 @@ +-- Welcome to the JC2-MP server configuration file! + +--[[ +SERVER OPTIONS + +Server-related options. +--]] +Server = +{ + -- The maximum number of players that can be on the server at any + -- given time. Make sure your connection and server can handle it! + -- Default value: 5000 + MaxPlayers = 5000, + -- Used to control what IP this server binds to. Unless you're a dedicated + -- game host, you don't need to worry about this. + -- Default value: "" + BindIP = "8.8.8.8", + -- The port the server uses. + -- Default value: 7777 + BindPort = 7777, + -- The time before a player is timed out after temporarily losing + -- connection, or crashing without properly disconnecting. + -- Default value (in milliseconds): 10000 + Timeout = 10000, + + -- The name of the server, as seen by players and the server browser. + -- Default value: "JC2-MP Server" + Name = "JC2-MP Server", + -- The server description, as seen by players and the server browser. + -- Default value: "No description available" + Description = "No description available.", + -- The server password. + -- Default value: "" + Password = "", + + -- Controls whether the server announces its presence to the master server + -- and therefore to the server browser. + -- Default value: true + Announce = true, + + -- Controls how often synchronization packets are broadcast by the server + -- in milliseconds + -- Default value (in milliseconds): 180 + SyncUpdate = 180, + + -- CAUTION: Setting this variable to true unlocks a number of potentially + -- unsafe operations, which include: + -- * Native Lua packages (.dll, .so) + -- * Execution of Lua from arbitrary paths (Access to loadfile/dofile) + -- * Unbound io functions, allowing for access to the entire file-system + -- Default value: false + IKnowWhatImDoing = false +} + +--[[ +SYNCRATE OPTIONS + +Sync rate options. These values control how often synchronization +packets are sent by the clients, in milliseconds. This lets you +control how frequent the sync comes in, which may result in a +smoother or less laggy experience +--]] +SyncRates = +{ + -- Default value (in milliseconds): 75 + Vehicle = 75, + -- Default value (in milliseconds): 120 + OnFoot = 120, + -- Default value (in milliseconds): 1000 + Passenger = 1000, + -- Default value (in milliseconds): 250 + MountedGun = 250, + -- Default value (in milliseconds): 350 + StuntPosition = 350 +} + +--[[ +STREAMER OPTIONS + +Streamer-related options. The streamer is responsible for controlling the +visibility of objects (including players and vehicles) for other players. + +What this means is that if you want to extend the distance at which objects +remain visible for players, you need to change the StreamDistance. +--]] +Streamer = +{ + -- The default distance before objects are streamed out. + -- Default value (in metres): 500 + StreamDistance = 500 +} + +--[[ +VEHICLE OPTIONS + +Vehicle-related options. +--]] +Vehicle = +{ + -- The number of seconds required for a vehicle to respawn after + -- vehicle death. + -- Default value (in seconds): 10 + -- For instant respawn: 0 + -- For no respawning: nil + DeathRespawnTime = 10, + -- Controls whether to remove the vehicle if respawning is turned off, + -- and the vehicle dies. + -- Default value: false + DeathRemove = false, + + -- The number of seconds required for a vehicle to respawn after it is + -- left unoccupied. + -- Default value (in seconds): 45 + -- For instant respawn: 0 + -- For no respawning: nil + UnoccupiedRespawnTime = 45, + -- Controls whether to remove the vehicle if respawning is turned off, + -- and the vehicle is left unoccupied. + -- Default value: false + UnoccupiedRemove = false, +} + +--[[ +PLAYER OPTIONS + +Player-related options. +--]] +Player = +{ + -- The default spawn position for players. If you do not use a script + -- to handle spawns, such as the freeroam script, then this spawn position + -- will be used. + -- Default value: Vector3( -6550, 209, -3290 ) + SpawnPosition = Vector3( -6550, 209, -3290 ) +} + +--[[ +MODULE OPTIONS + +Lua module-related options. +--]] +Module = +{ + --[[ + To prevent a large number of errors building up, modules are automatically + unloaded after a certain number of errors in a given timespan. Each error + adds to a counter, which is decremented if there has not been an error + in a certain amount of time. + + This allows you to adjust the number of errors before the module is unloaded, + as well as the time since the last error for the counter to be decremented. + --]] + + -- The maximum number of errors before a module is unloaded. + -- Default value: 5 + MaxErrorCount = 5, + -- The time from the last error necessary for the error counter to be decremented. + -- Default value (in milliseconds): 500 + ErrorDecrementTime = 500 +} + +--[[ +WORLD OPTIONS + +Default settings for worlds. +--]] +World = +{ + -- The default time of day at world creation. + -- Default value (in hours): 0.0 + Time = 0.0, + + -- The increment added to the time of day each second. + -- Default value (in minutes): 1 + TimeStep = 1, + + -- The default weather severity at world creation. + -- Default value: 0 + WeatherSeverity = 0 +} \ No newline at end of file From 043b44d315333c296cdad2a6ec562be8a8b231eb Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 13 Nov 2016 21:13:12 +0000 Subject: [PATCH 13/23] Added bypass for travis tests --- lgsm/functions/check_ip.sh | 2 +- tests/tests_jc2server.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh index c51015299..8141c534e 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" ] && [ "${gamename}" != "Mumble" ]; then +if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${travistest}" != "1" ]; then if [ ! -f "/bin/ip" ]; then ipcommand="/sbin/ip" else diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index a7886d81e..0563e0556 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -8,7 +8,7 @@ # Documentation: https://github.com/GameServerManagers/LinuxGSM/wiki # Website: https://gameservermanagers.com -version="101716" +travistest=1 # Debugging if [ -f ".dev-debug" ]; then From 8e7574a0393bb3716e56f1fa17a54cbf7068a7e8 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 13 Nov 2016 21:46:16 +0000 Subject: [PATCH 14/23] Removed this config as not required --- tests/config.lua | 180 ----------------------------------------------- 1 file changed, 180 deletions(-) delete mode 100644 tests/config.lua diff --git a/tests/config.lua b/tests/config.lua deleted file mode 100644 index ade07d0ee..000000000 --- a/tests/config.lua +++ /dev/null @@ -1,180 +0,0 @@ --- Welcome to the JC2-MP server configuration file! - ---[[ -SERVER OPTIONS - -Server-related options. ---]] -Server = -{ - -- The maximum number of players that can be on the server at any - -- given time. Make sure your connection and server can handle it! - -- Default value: 5000 - MaxPlayers = 5000, - -- Used to control what IP this server binds to. Unless you're a dedicated - -- game host, you don't need to worry about this. - -- Default value: "" - BindIP = "8.8.8.8", - -- The port the server uses. - -- Default value: 7777 - BindPort = 7777, - -- The time before a player is timed out after temporarily losing - -- connection, or crashing without properly disconnecting. - -- Default value (in milliseconds): 10000 - Timeout = 10000, - - -- The name of the server, as seen by players and the server browser. - -- Default value: "JC2-MP Server" - Name = "JC2-MP Server", - -- The server description, as seen by players and the server browser. - -- Default value: "No description available" - Description = "No description available.", - -- The server password. - -- Default value: "" - Password = "", - - -- Controls whether the server announces its presence to the master server - -- and therefore to the server browser. - -- Default value: true - Announce = true, - - -- Controls how often synchronization packets are broadcast by the server - -- in milliseconds - -- Default value (in milliseconds): 180 - SyncUpdate = 180, - - -- CAUTION: Setting this variable to true unlocks a number of potentially - -- unsafe operations, which include: - -- * Native Lua packages (.dll, .so) - -- * Execution of Lua from arbitrary paths (Access to loadfile/dofile) - -- * Unbound io functions, allowing for access to the entire file-system - -- Default value: false - IKnowWhatImDoing = false -} - ---[[ -SYNCRATE OPTIONS - -Sync rate options. These values control how often synchronization -packets are sent by the clients, in milliseconds. This lets you -control how frequent the sync comes in, which may result in a -smoother or less laggy experience ---]] -SyncRates = -{ - -- Default value (in milliseconds): 75 - Vehicle = 75, - -- Default value (in milliseconds): 120 - OnFoot = 120, - -- Default value (in milliseconds): 1000 - Passenger = 1000, - -- Default value (in milliseconds): 250 - MountedGun = 250, - -- Default value (in milliseconds): 350 - StuntPosition = 350 -} - ---[[ -STREAMER OPTIONS - -Streamer-related options. The streamer is responsible for controlling the -visibility of objects (including players and vehicles) for other players. - -What this means is that if you want to extend the distance at which objects -remain visible for players, you need to change the StreamDistance. ---]] -Streamer = -{ - -- The default distance before objects are streamed out. - -- Default value (in metres): 500 - StreamDistance = 500 -} - ---[[ -VEHICLE OPTIONS - -Vehicle-related options. ---]] -Vehicle = -{ - -- The number of seconds required for a vehicle to respawn after - -- vehicle death. - -- Default value (in seconds): 10 - -- For instant respawn: 0 - -- For no respawning: nil - DeathRespawnTime = 10, - -- Controls whether to remove the vehicle if respawning is turned off, - -- and the vehicle dies. - -- Default value: false - DeathRemove = false, - - -- The number of seconds required for a vehicle to respawn after it is - -- left unoccupied. - -- Default value (in seconds): 45 - -- For instant respawn: 0 - -- For no respawning: nil - UnoccupiedRespawnTime = 45, - -- Controls whether to remove the vehicle if respawning is turned off, - -- and the vehicle is left unoccupied. - -- Default value: false - UnoccupiedRemove = false, -} - ---[[ -PLAYER OPTIONS - -Player-related options. ---]] -Player = -{ - -- The default spawn position for players. If you do not use a script - -- to handle spawns, such as the freeroam script, then this spawn position - -- will be used. - -- Default value: Vector3( -6550, 209, -3290 ) - SpawnPosition = Vector3( -6550, 209, -3290 ) -} - ---[[ -MODULE OPTIONS - -Lua module-related options. ---]] -Module = -{ - --[[ - To prevent a large number of errors building up, modules are automatically - unloaded after a certain number of errors in a given timespan. Each error - adds to a counter, which is decremented if there has not been an error - in a certain amount of time. - - This allows you to adjust the number of errors before the module is unloaded, - as well as the time since the last error for the counter to be decremented. - --]] - - -- The maximum number of errors before a module is unloaded. - -- Default value: 5 - MaxErrorCount = 5, - -- The time from the last error necessary for the error counter to be decremented. - -- Default value (in milliseconds): 500 - ErrorDecrementTime = 500 -} - ---[[ -WORLD OPTIONS - -Default settings for worlds. ---]] -World = -{ - -- The default time of day at world creation. - -- Default value (in hours): 0.0 - Time = 0.0, - - -- The increment added to the time of day each second. - -- Default value (in minutes): 1 - TimeStep = 1, - - -- The default weather severity at world creation. - -- Default value: 0 - WeatherSeverity = 0 -} \ No newline at end of file From f0bd1bfc5c02353abe7600132ec5839bea30bc53 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 13 Nov 2016 21:51:45 +0000 Subject: [PATCH 15/23] Release/161113 (#1185) * Fixes #991 (#1165) * stbuf will no longer be used on x64 #991 * Added BF1942 ncurses requirement to CentOS * adding Call of Duty (#1118) * adding Call of Duty 2 (#1127) * Improvements up command_backup.sh added backup trap and improved lockfile support changes to the messages displayed on screen renamed some functions other misc changes --- 7DaysToDie/sdtdserver | 2 +- ARKSurvivalEvolved/arkserver | 2 +- Arma3/arma3server | 2 +- Battlefield1942/bf1942server | 2 +- BlackMesa/bmdmserver | 2 +- BladeSymphony/bsserver | 2 +- BrainBread2/bb2server | 2 +- CallOfDuty/codserver | 185 +++++++++++++++++++++++ CallOfDuty2/cod2server | 186 ++++++++++++++++++++++++ CodenameCURE/ccserver | 2 +- CounterStrike/csserver | 2 +- CounterStrikeConditionZero/csczserver | 2 +- CounterStrikeGlobalOffensive/csgoserver | 2 +- CounterStrikeSource/cssserver | 2 +- DayOfDefeat/dodserver | 2 +- DayOfDefeatSource/dodsserver | 2 +- DayOfInfamy/doiserver | 2 +- DeathmatchClassic/dmcserver | 2 +- DontStarveTogether/dstserver | 2 +- DoubleActionBoogaloo/dabserver | 2 +- FistfulOfFrags/fofserver | 2 +- GarrysMod/gmodserver | 2 +- GoldenEyeSource/gesserver | 2 +- HalfLife2Deathmatch/hl2dmserver | 2 +- HalfLifeDeathmatch/hldmserver | 2 +- HalfLifeDeathmatchSource/hldmsserver | 2 +- Hurtworld/hwserver | 2 +- Insurgency/insserver | 2 +- JustCause2/jc2server | 4 +- KillingFloor/kfserver | 2 +- Left4Dead/l4dserver | 2 +- Left4Dead2/l4d2server | 2 +- Minecraft/mcserver | 2 +- Mumble/mumbleserver | 2 +- NS2Combat/ns2cserver | 2 +- NaturalSelection2/ns2server | 2 +- NoMoreRoomInHell/nmrihserver | 2 +- OpposingForce/opforserver | 2 +- PiratesVikingandKnightsII/pvkiiserver | 2 +- ProjectZomboid/pzserver | 2 +- Quake2/q2server | 2 +- Quake3/q3server | 2 +- QuakeLive/qlserver | 2 +- RedOrchestra/roserver | 2 +- Ricochet/ricochetserver | 2 +- Rust/rustserver | 2 +- SeriousSam3BFE/ss3sserver | 2 +- Starbound/sbserver | 2 +- SvenCoop/svenserver | 2 +- TeamFortress2/tf2server | 2 +- TeamFortressClassic/tfcserver | 2 +- TeamSpeak3/ts3server | 2 +- Teeworlds/twserver | 2 +- Terraria/terrariaserver | 2 +- UnrealTournament/utserver | 2 +- UnrealTournament2004/ut2k4server | 2 +- UnrealTournament3/ut3server | 2 +- UnrealTournament99/ut99server | 2 +- WolfensteinEnemyTerritory/wetserver | 2 +- lgsm/functions/check_deps.sh | 11 +- lgsm/functions/check_ip.sh | 2 +- lgsm/functions/command_details.sh | 21 +++ lgsm/functions/command_install.sh | 2 +- lgsm/functions/command_monitor.sh | 2 +- lgsm/functions/core_getopt.sh | 2 +- lgsm/functions/fix.sh | 2 + lgsm/functions/fix_glibc.sh | 2 +- lgsm/functions/gsquery.py | 4 +- lgsm/functions/info_config.sh | 34 ++++- lgsm/functions/info_distro.sh | 6 +- lgsm/functions/info_glibc.sh | 6 + lgsm/functions/install_config.sh | 16 +- lgsm/functions/install_server_files.sh | 12 +- lgsm/functions/update_steamcmd.sh | 5 +- tests/tests_jc2server.sh | 115 ++++++++++----- 75 files changed, 619 insertions(+), 110 deletions(-) create mode 100755 CallOfDuty/codserver create mode 100755 CallOfDuty2/cod2server diff --git a/7DaysToDie/sdtdserver b/7DaysToDie/sdtdserver index 5825a9248..67607e35a 100644 --- a/7DaysToDie/sdtdserver +++ b/7DaysToDie/sdtdserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/ARKSurvivalEvolved/arkserver b/ARKSurvivalEvolved/arkserver index f2a9f2641..c2b30ab09 100644 --- a/ARKSurvivalEvolved/arkserver +++ b/ARKSurvivalEvolved/arkserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Arma3/arma3server b/Arma3/arma3server index e4b4fb83b..9fd409b21 100644 --- a/Arma3/arma3server +++ b/Arma3/arma3server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Battlefield1942/bf1942server b/Battlefield1942/bf1942server index 43212f78a..4f715a224 100644 --- a/Battlefield1942/bf1942server +++ b/Battlefield1942/bf1942server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/BlackMesa/bmdmserver b/BlackMesa/bmdmserver index 62bea603e..e55044e5d 100644 --- a/BlackMesa/bmdmserver +++ b/BlackMesa/bmdmserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/BladeSymphony/bsserver b/BladeSymphony/bsserver index 548adea2a..be7aa2266 100644 --- a/BladeSymphony/bsserver +++ b/BladeSymphony/bsserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/BrainBread2/bb2server b/BrainBread2/bb2server index 86c2fc9c8..b23bd5f31 100644 --- a/BrainBread2/bb2server +++ b/BrainBread2/bb2server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/CallOfDuty/codserver b/CallOfDuty/codserver new file mode 100755 index 000000000..497a00cd3 --- /dev/null +++ b/CallOfDuty/codserver @@ -0,0 +1,185 @@ +#!/bin/bash +# Project: Game Server Managers - LinuxGSM +# Author: Daniel Gibbs +# License: MIT License, Copyright (c) 2016 Daniel Gibbs +# Purpose: Call of Duty | Server Management Script +# Contributors: https://github.com/GameServerManagers/LinuxGSM/graphs/contributors +# Documentation: https://github.com/GameServerManagers/LinuxGSM/wiki +# Website: https://gameservermanagers.com + +# Debugging +if [ -f ".dev-debug" ]; then + exec 5>dev-debug.log + BASH_XTRACEFD="5" + set -x +fi + +version="161113" + +########################## +######## Settings ######## +########################## + +#### Server Settings #### + +## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters +defaultmap="mp_neuville" +maxclients="20" +port="28960" +ip="0.0.0.0" + +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters +fn_parms(){ +parms="+set sv_punkbuster 0 +set fs_basepath ${filesdir} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}" +} + +#### LinuxGSM Settings #### + +## Notification Alerts +# (on|off) +# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email +emailalert="off" +email="email@example.com" +emailfrom="" +# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet +pushbulletalert="off" +pushbullettoken="accesstoken" + +## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" + +## Logging | https://github.com/GameServerManagers/LinuxGSM/wiki/Logging +consolelogging="on" +logdays="7" + +#### Advanced Variables #### + +## Github Branch Select +# Allows for the use of different function files +# from a different repo and/or branch. +githubuser="GameServerManagers" +githubrepo="LinuxGSM" +githubbranch="master" + +## LinuxGSM Server Details +# Do not edit +gamename="Call of Duty" +engine="idtech3" + +## Service Name | https://github.com/GameServerManagers/LinuxGSM/wiki/Multiple-Servers +servicename="cod-server" + +#### Directories #### +# Edit with care + +## Work Directories +rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))" +selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" +lockselfname=".${servicename}.lock" +lgsmdir="${rootdir}/lgsm" +functionsdir="${lgsmdir}/functions" +libdir="${lgsmdir}/lib" +tmpdir="${lgsmdir}/tmp" +filesdir="${rootdir}/serverfiles" + +## Server Specific Directories +systemdir="${filesdir}" +executabledir="${filesdir}" +executable="./cod_lnxded" +servercfg="${servicename}.cfg" +servercfgdefault="server.cfg" +servercfgdir="${systemdir}/main" +servercfgfullpath="${servercfgdir}/${servercfg}" + +## Backup Directory +backupdir="${rootdir}/backups" + +## Logging Directories +gamelogdir="${filesdir}/Logs" +scriptlogdir="${rootdir}/log/script" +consolelogdir="${rootdir}/log/console" +scriptlog="${scriptlogdir}/${servicename}-script.log" +consolelog="${consolelogdir}/${servicename}-console.log" +emaillog="${scriptlogdir}/${servicename}-email.log" + +## Logs Naming +scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" + +######################## +######## Script ######## +###### Do not edit ##### +######################## + +# Fetches core_dl for file downloads +fn_fetch_core_dl(){ +github_file_url_dir="lgsm/functions" +github_file_url_name="${functionfile}" +filedir="${functionsdir}" +filename="${github_file_url_name}" +githuburl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${github_file_url_name}" +# If the file is missing, then download +if [ ! -f "${filedir}/${filename}" ]; then + if [ ! -d "${filedir}" ]; then + mkdir -p "${filedir}" + fi + echo -e " fetching ${filename}...\c" + # Check curl exists and use available path + curlpaths="$(command -v curl 2>/dev/null) $(which curl >/dev/null 2>&1) /usr/bin/curl /bin/curl /usr/sbin/curl /sbin/curl)" + for curlcmd in ${curlpaths} + do + if [ -x "${curlcmd}" ]; then + break + fi + done + # If curl exists download file + if [ "$(basename ${curlcmd})" == "curl" ]; then + curlfetch=$(${curlcmd} -s --fail -o "${filedir}/${filename}" "${githuburl}" 2>&1) + if [ $? -ne 0 ]; then + echo -e "\e[0;31mFAIL\e[0m\n" + echo "${curlfetch}" + echo -e "${githuburl}\n" + exit 1 + else + echo -e "\e[0;32mOK\e[0m" + fi + else + echo -e "\e[0;31mFAIL\e[0m\n" + echo "Curl is not installed!" + echo -e "" + exit 1 + fi + chmod +x "${filedir}/${filename}" +fi +source "${filedir}/${filename}" +} + +core_dl.sh(){ +# Functions are defined in core_functions.sh. +functionfile="${FUNCNAME}" +fn_fetch_core_dl +} + +core_functions.sh(){ +# Functions are defined in core_functions.sh. +functionfile="${FUNCNAME}" +fn_fetch_core_dl +} + +# Prevent from running this script as root. +if [ "$(whoami)" = "root" ]; then + if [ ! -f "${functionsdir}/core_functions.sh" ]||[ ! -f "${functionsdir}/check_root.sh" ]||[ ! -f "${functionsdir}/core_messages.sh" ]||[ ! -f "${functionsdir}/core_exit.sh" ]; then + echo "[ FAIL ] Do NOT run this script as root!" + exit 1 + else + core_functions.sh + check_root.sh + fi +fi + +core_dl.sh +core_functions.sh +getopt=$1 +core_getopt.sh \ No newline at end of file diff --git a/CallOfDuty2/cod2server b/CallOfDuty2/cod2server new file mode 100755 index 000000000..58214c9c4 --- /dev/null +++ b/CallOfDuty2/cod2server @@ -0,0 +1,186 @@ +#!/bin/bash +# Project: Game Server Managers - LinuxGSM +# Author: Daniel Gibbs +# License: MIT License, Copyright (c) 2016 Daniel Gibbs +# Purpose: Call of Duty 2 | Server Management Script +# Contributors: https://github.com/GameServerManagers/LinuxGSM/graphs/contributors +# Documentation: https://github.com/GameServerManagers/LinuxGSM/wiki +# Website: https://gameservermanagers.com + +# Debugging +if [ -f ".dev-debug" ]; then + exec 5>dev-debug.log + BASH_XTRACEFD="5" + set -x +fi + +version="161113" + +########################## +######## Settings ######## +########################## + +#### Server Settings #### + +## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters + +defaultmap="mp_leningrad" +maxclients="20" +port="28960" +ip="0.0.0.0" + +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters +fn_parms(){ +parms="+set sv_punkbuster 0 +set fs_basepath ${filesdir} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}" +} + +#### LinuxGSM Settings #### + +## Notification Alerts +# (on|off) +# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email +emailalert="off" +email="email@example.com" +emailfrom="" +# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet +pushbulletalert="off" +pushbullettoken="accesstoken" + +## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" + +## Logging | https://github.com/GameServerManagers/LinuxGSM/wiki/Logging +consolelogging="on" +logdays="7" + +#### Advanced Variables #### + +## Github Branch Select +# Allows for the use of different function files +# from a different repo and/or branch. +githubuser="GameServerManagers" +githubrepo="LinuxGSM" +githubbranch="master" + +## LinuxGSM Server Details +# Do not edit +gamename="Call of Duty 2" +engine="iw2.0" + +## Service Name | https://github.com/GameServerManagers/LinuxGSM/wiki/Multiple-Servers +servicename="cod2-server" + +#### Directories #### +# Edit with care + +## Work Directories +rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))" +selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" +lockselfname=".${servicename}.lock" +lgsmdir="${rootdir}/lgsm" +functionsdir="${lgsmdir}/functions" +libdir="${lgsmdir}/lib" +tmpdir="${lgsmdir}/tmp" +filesdir="${rootdir}/serverfiles" + +## Server Specific Directories +systemdir="${filesdir}" +executabledir="${filesdir}" +executable="./cod2_lnxded" +servercfg="${servicename}.cfg" +servercfgdefault="server.cfg" +servercfgdir="${systemdir}/main" +servercfgfullpath="${servercfgdir}/${servercfg}" + +## Backup Directory +backupdir="${rootdir}/backups" + +## Logging Directories +gamelogdir="${filesdir}/Logs" +scriptlogdir="${rootdir}/log/script" +consolelogdir="${rootdir}/log/console" +scriptlog="${scriptlogdir}/${servicename}-script.log" +consolelog="${consolelogdir}/${servicename}-console.log" +emaillog="${scriptlogdir}/${servicename}-email.log" + +## Logs Naming +scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" + +######################## +######## Script ######## +###### Do not edit ##### +######################## + +# Fetches core_dl for file downloads +fn_fetch_core_dl(){ +github_file_url_dir="lgsm/functions" +github_file_url_name="${functionfile}" +filedir="${functionsdir}" +filename="${github_file_url_name}" +githuburl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${github_file_url_name}" +# If the file is missing, then download +if [ ! -f "${filedir}/${filename}" ]; then + if [ ! -d "${filedir}" ]; then + mkdir -p "${filedir}" + fi + echo -e " fetching ${filename}...\c" + # Check curl exists and use available path + curlpaths="$(command -v curl 2>/dev/null) $(which curl >/dev/null 2>&1) /usr/bin/curl /bin/curl /usr/sbin/curl /sbin/curl)" + for curlcmd in ${curlpaths} + do + if [ -x "${curlcmd}" ]; then + break + fi + done + # If curl exists download file + if [ "$(basename ${curlcmd})" == "curl" ]; then + curlfetch=$(${curlcmd} -s --fail -o "${filedir}/${filename}" "${githuburl}" 2>&1) + if [ $? -ne 0 ]; then + echo -e "\e[0;31mFAIL\e[0m\n" + echo "${curlfetch}" + echo -e "${githuburl}\n" + exit 1 + else + echo -e "\e[0;32mOK\e[0m" + fi + else + echo -e "\e[0;31mFAIL\e[0m\n" + echo "Curl is not installed!" + echo -e "" + exit 1 + fi + chmod +x "${filedir}/${filename}" +fi +source "${filedir}/${filename}" +} + +core_dl.sh(){ +# Functions are defined in core_functions.sh. +functionfile="${FUNCNAME}" +fn_fetch_core_dl +} + +core_functions.sh(){ +# Functions are defined in core_functions.sh. +functionfile="${FUNCNAME}" +fn_fetch_core_dl +} + +# Prevent from running this script as root. +if [ "$(whoami)" = "root" ]; then + if [ ! -f "${functionsdir}/core_functions.sh" ]||[ ! -f "${functionsdir}/check_root.sh" ]||[ ! -f "${functionsdir}/core_messages.sh" ]||[ ! -f "${functionsdir}/core_exit.sh" ]; then + echo "[ FAIL ] Do NOT run this script as root!" + exit 1 + else + core_functions.sh + check_root.sh + fi +fi + +core_dl.sh +core_functions.sh +getopt=$1 +core_getopt.sh \ No newline at end of file diff --git a/CodenameCURE/ccserver b/CodenameCURE/ccserver index dd622b8ae..b9682f910 100644 --- a/CodenameCURE/ccserver +++ b/CodenameCURE/ccserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/CounterStrike/csserver b/CounterStrike/csserver index bca3e12a3..5c9906da3 100644 --- a/CounterStrike/csserver +++ b/CounterStrike/csserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/CounterStrikeConditionZero/csczserver b/CounterStrikeConditionZero/csczserver index 5eb278771..75da8b7b8 100644 --- a/CounterStrikeConditionZero/csczserver +++ b/CounterStrikeConditionZero/csczserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver index 8018883b9..1dded9f29 100755 --- a/CounterStrikeGlobalOffensive/csgoserver +++ b/CounterStrikeGlobalOffensive/csgoserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver index 78345eb9c..857faf6f0 100644 --- a/CounterStrikeSource/cssserver +++ b/CounterStrikeSource/cssserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/DayOfDefeat/dodserver b/DayOfDefeat/dodserver index e6db43522..ead2232d4 100644 --- a/DayOfDefeat/dodserver +++ b/DayOfDefeat/dodserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver index 8386384b6..abe4ab056 100644 --- a/DayOfDefeatSource/dodsserver +++ b/DayOfDefeatSource/dodsserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/DayOfInfamy/doiserver b/DayOfInfamy/doiserver index d39568a53..1aac2bb8c 100644 --- a/DayOfInfamy/doiserver +++ b/DayOfInfamy/doiserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/DeathmatchClassic/dmcserver b/DeathmatchClassic/dmcserver index d2be5c1be..d5c594bde 100644 --- a/DeathmatchClassic/dmcserver +++ b/DeathmatchClassic/dmcserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/DontStarveTogether/dstserver b/DontStarveTogether/dstserver index 5b9a5c112..99493668f 100644 --- a/DontStarveTogether/dstserver +++ b/DontStarveTogether/dstserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/DoubleActionBoogaloo/dabserver b/DoubleActionBoogaloo/dabserver index c080c568a..088b45695 100644 --- a/DoubleActionBoogaloo/dabserver +++ b/DoubleActionBoogaloo/dabserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/FistfulOfFrags/fofserver b/FistfulOfFrags/fofserver index 7dc5cc571..dc74a2534 100644 --- a/FistfulOfFrags/fofserver +++ b/FistfulOfFrags/fofserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/GarrysMod/gmodserver b/GarrysMod/gmodserver index 1bbba189c..adeef431c 100644 --- a/GarrysMod/gmodserver +++ b/GarrysMod/gmodserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/GoldenEyeSource/gesserver b/GoldenEyeSource/gesserver index 7dd85e2f6..bc44ae33c 100644 --- a/GoldenEyeSource/gesserver +++ b/GoldenEyeSource/gesserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/HalfLife2Deathmatch/hl2dmserver b/HalfLife2Deathmatch/hl2dmserver index 6b0489fe6..a6ab0634e 100644 --- a/HalfLife2Deathmatch/hl2dmserver +++ b/HalfLife2Deathmatch/hl2dmserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/HalfLifeDeathmatch/hldmserver b/HalfLifeDeathmatch/hldmserver index 43e3bf106..b9f1e2432 100644 --- a/HalfLifeDeathmatch/hldmserver +++ b/HalfLifeDeathmatch/hldmserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/HalfLifeDeathmatchSource/hldmsserver b/HalfLifeDeathmatchSource/hldmsserver index 07b2c24cf..b1e2b02e6 100644 --- a/HalfLifeDeathmatchSource/hldmsserver +++ b/HalfLifeDeathmatchSource/hldmsserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Hurtworld/hwserver b/Hurtworld/hwserver index d63e5a346..80fca576c 100644 --- a/Hurtworld/hwserver +++ b/Hurtworld/hwserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Insurgency/insserver b/Insurgency/insserver index 6a2748478..4ba642794 100644 --- a/Insurgency/insserver +++ b/Insurgency/insserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/JustCause2/jc2server b/JustCause2/jc2server index 4c89b31c1..5bc7b3623 100644 --- a/JustCause2/jc2server +++ b/JustCause2/jc2server @@ -3,7 +3,7 @@ # Project: Game Server Managers - LinuxGSM # Author: Daniel Gibbs # License: MIT License, Copyright (c) 2016 Daniel Gibbs -# Purpose: GAMENAME | Server Management Script +# Purpose: Just Cause 2 | Server Management Script # Contributors: https://github.com/GameServerManagers/LinuxGSM/graphs/contributors # Documentation: https://github.com/GameServerManagers/LinuxGSM/wiki # Website: https://gameservermanagers.com @@ -15,7 +15,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/KillingFloor/kfserver b/KillingFloor/kfserver index 5f0e44154..f2253d707 100644 --- a/KillingFloor/kfserver +++ b/KillingFloor/kfserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Left4Dead/l4dserver b/Left4Dead/l4dserver index 2a7a20be1..fc1278113 100644 --- a/Left4Dead/l4dserver +++ b/Left4Dead/l4dserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server index 0a84f1d83..ba9da4f91 100644 --- a/Left4Dead2/l4d2server +++ b/Left4Dead2/l4d2server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Minecraft/mcserver b/Minecraft/mcserver index ab69b9010..d0f77e5cd 100644 --- a/Minecraft/mcserver +++ b/Minecraft/mcserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Mumble/mumbleserver b/Mumble/mumbleserver index ace1dac08..7d83cf15d 100644 --- a/Mumble/mumbleserver +++ b/Mumble/mumbleserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/NS2Combat/ns2cserver b/NS2Combat/ns2cserver index 460ce874c..5b50fdfff 100644 --- a/NS2Combat/ns2cserver +++ b/NS2Combat/ns2cserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/NaturalSelection2/ns2server b/NaturalSelection2/ns2server index 741f37862..7e4c34514 100644 --- a/NaturalSelection2/ns2server +++ b/NaturalSelection2/ns2server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/NoMoreRoomInHell/nmrihserver b/NoMoreRoomInHell/nmrihserver index d5910ab44..65e220b5f 100644 --- a/NoMoreRoomInHell/nmrihserver +++ b/NoMoreRoomInHell/nmrihserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/OpposingForce/opforserver b/OpposingForce/opforserver index 1c059ed6b..e3db2a701 100644 --- a/OpposingForce/opforserver +++ b/OpposingForce/opforserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/PiratesVikingandKnightsII/pvkiiserver b/PiratesVikingandKnightsII/pvkiiserver index bc7767adb..32310d7f3 100644 --- a/PiratesVikingandKnightsII/pvkiiserver +++ b/PiratesVikingandKnightsII/pvkiiserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/ProjectZomboid/pzserver b/ProjectZomboid/pzserver index 0586a2c13..10fc6066c 100644 --- a/ProjectZomboid/pzserver +++ b/ProjectZomboid/pzserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Quake2/q2server b/Quake2/q2server index 94de84180..8bdbbeba1 100644 --- a/Quake2/q2server +++ b/Quake2/q2server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Quake3/q3server b/Quake3/q3server index c302f10c0..ec403b301 100644 --- a/Quake3/q3server +++ b/Quake3/q3server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/QuakeLive/qlserver b/QuakeLive/qlserver index 33cc3696c..95dfee65a 100755 --- a/QuakeLive/qlserver +++ b/QuakeLive/qlserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/RedOrchestra/roserver b/RedOrchestra/roserver index 025bf348c..c62ae3144 100644 --- a/RedOrchestra/roserver +++ b/RedOrchestra/roserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Ricochet/ricochetserver b/Ricochet/ricochetserver index 8eb18e0c1..fb1b9c828 100644 --- a/Ricochet/ricochetserver +++ b/Ricochet/ricochetserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Rust/rustserver b/Rust/rustserver index 870f42d04..6300440a0 100644 --- a/Rust/rustserver +++ b/Rust/rustserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/SeriousSam3BFE/ss3sserver b/SeriousSam3BFE/ss3sserver index f0b1181e9..756782b71 100644 --- a/SeriousSam3BFE/ss3sserver +++ b/SeriousSam3BFE/ss3sserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Starbound/sbserver b/Starbound/sbserver index dd5e70e4e..b27081421 100644 --- a/Starbound/sbserver +++ b/Starbound/sbserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/SvenCoop/svenserver b/SvenCoop/svenserver index 82101fefa..193efdd9a 100644 --- a/SvenCoop/svenserver +++ b/SvenCoop/svenserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/TeamFortress2/tf2server b/TeamFortress2/tf2server index 5adfaa87b..e9343bd63 100644 --- a/TeamFortress2/tf2server +++ b/TeamFortress2/tf2server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/TeamFortressClassic/tfcserver b/TeamFortressClassic/tfcserver index 8b6994e4a..d5caad15a 100644 --- a/TeamFortressClassic/tfcserver +++ b/TeamFortressClassic/tfcserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/TeamSpeak3/ts3server b/TeamSpeak3/ts3server index f0bfbb8ea..d400f191f 100644 --- a/TeamSpeak3/ts3server +++ b/TeamSpeak3/ts3server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Teeworlds/twserver b/Teeworlds/twserver index bae6a0427..65acc8168 100644 --- a/Teeworlds/twserver +++ b/Teeworlds/twserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/Terraria/terrariaserver b/Terraria/terrariaserver index a7b2b6c8b..fb143b6ef 100644 --- a/Terraria/terrariaserver +++ b/Terraria/terrariaserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/UnrealTournament/utserver b/UnrealTournament/utserver index d011b93ad..f2383df8f 100644 --- a/UnrealTournament/utserver +++ b/UnrealTournament/utserver @@ -15,7 +15,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/UnrealTournament2004/ut2k4server b/UnrealTournament2004/ut2k4server index c8c1f55ee..56d61b464 100644 --- a/UnrealTournament2004/ut2k4server +++ b/UnrealTournament2004/ut2k4server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/UnrealTournament3/ut3server b/UnrealTournament3/ut3server index b65b633bb..a9ec44cf8 100644 --- a/UnrealTournament3/ut3server +++ b/UnrealTournament3/ut3server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/UnrealTournament99/ut99server b/UnrealTournament99/ut99server index 8787df657..6ccecea9a 100644 --- a/UnrealTournament99/ut99server +++ b/UnrealTournament99/ut99server @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/WolfensteinEnemyTerritory/wetserver b/WolfensteinEnemyTerritory/wetserver index c4a5a0db8..1364157b9 100644 --- a/WolfensteinEnemyTerritory/wetserver +++ b/WolfensteinEnemyTerritory/wetserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161030" +version="161113" ########################## ######## Settings ######## diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index eb9d21f03..62d9ed6f6 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -185,9 +185,12 @@ if [ -n "$(command -v dpkg-query)" ]; then # Brainbread 2 and Don't Starve Together elif [ "${gamename}" == "Brainbread 2" ]||[ "${gamename}" == "Don't Starve Together" ]; then array_deps_required+=( libcurl4-gnutls-dev:i386 ) - # Battlefield: 1942 requies ncurses + # Battlefield: 1942 elif [ "${gamename}" == "Battlefield: 1942" ]; then array_deps_required+=( libncurses5:i386 ) + # Call of Duty + elif [ "${gamename}" == "Call of Duty" ]||[ "${gamename}" == "Call of Duty 2" ]; then + array_deps_required+=( libstdc++5:i386 ) # Project Zomboid and Minecraft elif [ "${engine}" == "projectzomboid" ]||[ "${engine}" == "lwjgl2" ]; then javaversion=$(java -version 2>&1 | grep "version") @@ -254,6 +257,12 @@ elif [ -n "$(command -v yum)" ]; then # Brainbread 2 and Don't Starve Together elif [ "${gamename}" == "Brainbread 2" ]||[ "${gamename}" == "Don't Starve Together" ]; then array_deps_required+=( libcurl.i686 ) + # Battlefield: 1942 + elif [ "${gamename}" == "Battlefield: 1942" ]; then + array_deps_required+=( ncurses-libs.i686 ) + # Call of Duty + elif [ "${gamename}" == "Call of Duty" ]||[ "${gamename}" == "Call of Duty 2" ]; then + array_deps_required+=( compat-libstdc++-33.i686 ) # Project Zomboid and Minecraft elif [ "${engine}" == "projectzomboid" ]||[ "${engine}" == "lwjgl2" ]; then javaversion=$(java -version 2>&1 | grep "version") diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh index c51015299..8141c534e 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" ] && [ "${gamename}" != "Mumble" ]; then +if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${travistest}" != "1" ]; then if [ ! -f "/bin/ip" ]; then ipcommand="/sbin/ip" else diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh index 5743e17b0..4ce097e1a 100644 --- a/lgsm/functions/command_details.sh +++ b/lgsm/functions/command_details.sh @@ -341,6 +341,15 @@ fn_details_avalanche(){ } | column -s $'\t' -t } +fn_details_cod(){ + echo -e "netstat -atunp | grep cod_lnxded" + echo -e "" + { + echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" + echo -e "> Game\tINBOUND\t${port}\tudp" + } | column -s $'\t' -t +} + fn_details_dontstarve(){ echo -e "netstat -atunp | grep dontstarve" echo -e "" @@ -643,6 +652,14 @@ fn_details_ark(){ } | column -s $'\t' -t } +fn_details_cod2(){ + echo -e "netstat -atunp | grep cod2_lnxded" + echo -e "" + { + echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" + echo -e "> Game\tINBOUND\t${port}\tudp" + } | column -s $'\t' -t +} # Run checks and gathers details to display. @@ -698,6 +715,10 @@ fn_display_details() { fn_details_sdtd elif [ "${gamename}" == "ARK: Survivial Evolved" ]; then fn_details_ark + elif [ "${gamename}" == "Call of Duty" ]; then + fn_details_cod + elif [ "${gamename}" == "Call of Duty 2" ]; then + fn_details_cod2 elif [ "${gamename}" == "Hurtworld" ]; then fn_details_hurtworld elif [ "${gamename}" == "QuakeWorld" ]; then diff --git a/lgsm/functions/command_install.sh b/lgsm/functions/command_install.sh index d2feadb05..e36ac5967 100644 --- a/lgsm/functions/command_install.sh +++ b/lgsm/functions/command_install.sh @@ -18,7 +18,7 @@ check_deps.sh if [ "${gamename}" == "Unreal Tournament 2004" ]; then install_server_files.sh install_ut2k4_key.sh -elif [ "${gamename}" == "Battlefield: 1942" ]||[ "${gamename}" == "Minecraft" ]||[ "${gamename}" == "Quake 2" ]||[ "${gamename}" == "Quake 3: Arena" ]||[ "${gamename}" == "QuakeWorld" ]||[ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Unreal Tournament 3" ]||[ "${gamename}" == "Unreal Tournament" ]||[ "${gamename}" == "TeamSpeak 3" ]||[ "${gamename}" == "Mumble" ]||[ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then +elif [ "${gamename}" == "Battlefield: 1942" ]||[ "${gamename}" == "Call of Duty" ]||[ "${gamename}" == "Call of Duty 2" ]||[ "${gamename}" == "Minecraft" ]||[ "${gamename}" == "Quake 2" ]||[ "${gamename}" == "Quake 3: Arena" ]||[ "${gamename}" == "QuakeWorld" ]||[ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Unreal Tournament 3" ]||[ "${gamename}" == "Unreal Tournament" ]||[ "${gamename}" == "TeamSpeak 3" ]||[ "${gamename}" == "Mumble" ]||[ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then installer=1 install_server_files.sh elif [ -n "${appid}" ]; then diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh index 3c6d7fad4..2e5de3402 100644 --- a/lgsm/functions/command_monitor.sh +++ b/lgsm/functions/command_monitor.sh @@ -79,7 +79,7 @@ fn_monitor_tmux(){ fn_print_ok_eol_nl fn_script_log_pass "Checking session: OK" # runs gsquery check on game with specific engines. - local allowed_engines_array=( avalanche goldsource idtech3 idtech3_ql quake refractor realvirtuality source spark unity3d unreal unreal2 ) + local allowed_engines_array=( avalanche goldsource idtech3 idtech3_ql iw2.0 quake refractor realvirtuality source spark unity3d unreal unreal2 ) for allowed_engine in "${allowed_engines_array[@]}" do if [ "${allowed_engine}" == "${engine}" ]; then diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh index d07f82d04..ec1e45713 100644 --- a/lgsm/functions/core_getopt.sh +++ b/lgsm/functions/core_getopt.sh @@ -622,7 +622,7 @@ case "${getopt}" in if [ "${gamename}" == "Mumble" ]; then fn_getopt_mumble -elif [ "${gamename}" == "Battlefield: 1942" ]||[ "${gamename}" == "QuakeWorld" ]||[ "${gamename}" == "Quake 2" ]||[ "${gamename}" == "Quake 3: Arena" ]||[ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then +elif [ "${gamename}" == "Battlefield: 1942" ]||[ "${gamename}" == "Call of Duty" ]||[ "${gamename}" == "Call of Duty 2" ]||[ "${gamename}" == "QuakeWorld" ]||[ "${gamename}" == "Quake 2" ]||[ "${gamename}" == "Quake 3: Arena" ]||[ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then fn_getopt_generic_no_update elif [ "${engine}" == "lwjgl2" ]; then fn_getopt_minecraft diff --git a/lgsm/functions/fix.sh b/lgsm/functions/fix.sh index 5671ed627..a57e179c4 100644 --- a/lgsm/functions/fix.sh +++ b/lgsm/functions/fix.sh @@ -37,6 +37,8 @@ if [ "${function_selfname}" != "command_install.sh" ]; then if [ "${gamename}" == "ARMA 3" ]; then fix_arma3.sh + elif [ "${gamename}" == "Call of Duty 2" ]; then + fix_cod2.sh elif [ "${gamename}" == "Counter-Strike: Global Offensive" ]; then fix_csgo.sh elif [ "${gamename}" == "Don't Starve Together" ]; then diff --git a/lgsm/functions/fix_glibc.sh b/lgsm/functions/fix_glibc.sh index 6408e3339..5abc18e9a 100644 --- a/lgsm/functions/fix_glibc.sh +++ b/lgsm/functions/fix_glibc.sh @@ -40,4 +40,4 @@ do fi done -export LD_LIBRARY_PATH=:"${libdir}" \ No newline at end of file +export LD_LIBRARY_PATH=:"${libdir}" diff --git a/lgsm/functions/gsquery.py b/lgsm/functions/gsquery.py index cd46717cd..e45d891cb 100644 --- a/lgsm/functions/gsquery.py +++ b/lgsm/functions/gsquery.py @@ -26,6 +26,8 @@ class GameServer: self.query_prompt_string = b'\xff\xff\xff\xffstatus\x00' elif self.option.engine == 'idtech3': self.query_prompt_string = b'\xff\xff\xff\xffgetstatus' + elif self.option.engine == 'iw2.0': + self.query_prompt_string = b'\xff\xff\xff\xffgetstatus' elif self.option.engine == 'quake': self.query_prompt_string = b'\xff\xff\xff\xffstatus\x00' elif self.option.engine == 'quakelive': @@ -113,7 +115,7 @@ if __name__ == '__main__': action='store', dest='engine', default=False, - help='Engine type: avalanche, goldsource, idtech2, idtech3, realvirtuality, quake, quakelive, refractor, spark, source, unity3d, unreal, unreal2.' + help='Engine type: avalanche, goldsource, idtech2, idtech3, iw2.0, realvirtuality, quake, quakelive, refractor, spark, source, unity3d, unreal, unreal2.' ) parser.add_option( '-v', '--verbose', diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 7982ebd69..198ffa656 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -66,6 +66,33 @@ fn_info_config_bf1942(){ fi } +fn_info_config_cod(){ + if [ ! -f "${servercfgfullpath}" ]; then + servername="${unavailable}" + rconpassword="${unavailable}" + else + servername=$(grep "sv_hostname " "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/set sv_hostname //g' | tr -d '=\";,:' | xargs) + rconpassword=$(grep "rconpassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/set rconpassword //g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + + # Not Set + servername=${servername:-"NOT SET"} + rconpassword=${rconpassword=:-"NOT SET"} + fi +} + +fn_info_config_cod2(){ + if [ ! -f "${servercfgfullpath}" ]; then + servername="${unavailable}" + rconpassword="${unavailable}" + else + servername=$(grep "sv_hostname " "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/set sv_hostname //g' | tr -d '=\";,:' | xargs) + rconpassword=$(grep "rconpassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/set rconpassword //g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + + # Not Set + servername=${servername:-"NOT SET"} + rconpassword=${rconpassword=:-"NOT SET"} + fi +} fn_info_config_dontstarve(){ if [ ! -f "${servercfgfullpath}" ]; then @@ -103,7 +130,6 @@ fn_info_config_minecraft(){ gamemode="${unavailable}" gameworld="${unavailable}" else - servername=$(grep "motd" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/motd//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') rconpassword=$(grep "rcon.password" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/rcon.password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') rconport=$(grep "rcon.port" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') @@ -510,6 +536,12 @@ if [ "${engine}" == "avalanche" ]; then # Battlefield: 1942 elif [ "${gamename}" == "Battlefield: 1942" ]; then fn_info_config_bf1942 +# Call of Duty +elif [ "${gamename}" == "Call of Duty" ]; then + fn_info_config_cod +# Call of Duty 2 +elif [ "${gamename}" == "Call of Duty 2" ]; then + fn_info_config_cod2 # Dont Starve Together elif [ "${engine}" == "dontstarve" ]; then fn_info_config_dontstarve diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index cc4037d72..16973cfc1 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -108,12 +108,16 @@ fi ## Backup info if [ -d "${backupdir}" ]; then - # Ued space in backups dir. + # Used space in backups dir. backupdirdu=$(du -sh "${backupdir}" | awk '{print $1}') # If no backup dir, size is 0M if [ -z "${backupdirdu}" ]; then backupdirdu="0M" fi + + # number of backups set to 0 by default + backupcount=0 + # If there are backups in backup dir. if [ $(find "${backupdir}" -name "*.tar.gz" | wc -l) -ne "0" ]; then # number of backups. diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index 73ef6251d..b5e4cb0a2 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -14,6 +14,12 @@ elif [ "${gamename}" == "Blade Symphony" ]; then glibcfix="yes" elif [ "${gamename}" == "BrainBread 2" ]; then glibcrequired="2.17" +elif [ "${gamename}" == "Call of Duty" ]; then + glibcrequired="2.1" + glibcfix="no" +elif [ "${gamename}" == "Call of Duty 2" ]; then + glibcrequired="2.1.3" + glibcfix="no" elif [ "${gamename}" == "Day of Infamy" ]; then glibcrequired="2.15" glibcfix="yes" diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index bdd7cb23e..872618c1e 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -113,6 +113,18 @@ elif [ "${gamename}" == "Black Mesa: Deathmatch" ]; then fn_fetch_default_config fn_default_config_remote fn_set_config_vars +elif [ "${gamename}" == "Call of Duty" ]; then + gamedirname="CallOfDuty" + array_configs+=( server.cfg ) + fn_fetch_default_config + fn_default_config_remote + fn_set_config_vars +elif [ "${gamename}" == "Call of Duty 2" ]; then + gamedirname="CallofDuty2" + array_configs+=( server.cfg ) + fn_fetch_default_config + fn_default_config_remote + fn_set_config_vars elif [ "${gamename}" == "Codename CURE" ]; then gamedirname="CodenameCURE" array_configs+=( server.cfg ) @@ -336,7 +348,7 @@ elif [ "${gamename}" == "Serious Sam 3: BFE" ]; then fn_set_config_vars elif [ "${gamename}" == "Starbound" ]; then gamedirname="Starbound" - array_configs+=( starbound.config ) + array_configs+=( starbound_server.config ) fn_fetch_default_config fn_default_config_remote fn_set_config_vars @@ -405,4 +417,4 @@ elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then fn_fetch_default_config fn_default_config_remote fn_set_config_vars -fi \ No newline at end of file +fi diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 7f4072a81..95e5cc379 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -11,6 +11,8 @@ local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" fn_install_server_files(){ if [ "${gamename}" == "Unreal Tournament 99" ]; then fileurl="http://files.gameservermanagers.com/UnrealTournament99/ut99-server-451-ultimate-linux.tar.bz2"; filedir="${tmpdir}"; filename="ut99-server-451-ultimate-linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="49cb24d0550ff6ddeaba6007045c6edd" + elif [ "${gamename}" == "Call of Duty 2" ]; then + fileurl="http://files.gameservermanagers.com/CallOfDuty2/cod2-lnxded-1.3-full.tar.bz2"; filedir="${tmpdir}"; filename="cod2-lnxded-1.3-full.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="078128f83d06dc3d7699428dc2870214" elif [ "${gamename}" == "Unreal Tournament 2004" ]; then fileurl="http://files.gameservermanagers.com/UnrealTournament2004/ut2004-server-3339-ultimate-linux.tar.bz2"; filedir="${tmpdir}"; filename="ut2004-server-3339-ultimate-linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="67c5e2cd9c2a4b04f163962ee41eff54" elif [ "${gamename}" == "Unreal Tournament 3" ]; then @@ -23,13 +25,14 @@ fn_install_server_files(){ fileurl="http://files.gameservermanagers.com/UnrealTournament/UnrealTournament-Server-XAN-3045522-Linux.zip"; filedir="${tmpdir}"; filename="UnrealTournament-Server-XAN-3045522-Linux.zip"; executecmd="noexecute" run="norun"; force="noforce"; md5="553fed5645a9fc623e92563049bf79f6" elif [ "${gamename}" == "GoldenEye: Source" ]; then fileurl="http://files.gameservermanagers.com/GoldenEyeSource/GoldenEye_Source_v5.0.1_full_server_linux.tar.bz2"; filedir="${tmpdir}"; filename="GoldenEye_Source_v5.0.1_server_full_Linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="ea227a150300abe346e757380325f84c" + elif [ "${gamename}" == "Call of Duty" ]; then + fileurl="http://files.gameservermanagers.com/CallOfDuty/cod-lnxded-1.5b-full.tar.bz2"; filedir="${tmpdir}"; filename="cod-lnxded-1.5-large.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="19629895a4cf6fd8f6d1ee198b5304cd" elif [ "${gamename}" == "Quake 2" ]; then fileurl="http://files.gameservermanagers.com/Quake2/quake2-3.20-glibc-i386-full-linux2.0.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="quake2-3.20-glibc-i386-full-linux2.0.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="0b8c7e2d51f40b56b328c69e986e7c5f" elif [ "${gamename}" == "Quake 3: Arena" ]; then fileurl="http://files.gameservermanagers.com/Quake3/quake3-1.32c-x86-full-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="quake3-1.32c-x86-full-linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="fd7258d827474f67663dda297bff4306" elif [ "${gamename}" == "QuakeWorld" ]; then fileurl="http://files.gameservermanagers.com/QuakeWorld/nquake.server.linux.083116.full.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="nquake.server.linux.083116.full.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="75a409cf08d808f075e4dacdc7b21b78" - fi fn_fetch_file "${fileurl}" "${filedir}" "${filename}" "${executecmd}" "${run}" "${force}" "${md5}" fn_dl_extract "${filedir}" "${filename}" "${filesdir}" @@ -61,8 +64,9 @@ fn_install_server_files_steamcmd(){ check_steamcmd.sh fi - # Detects if unbuffer command is available. - if [ $(command -v stdbuf) ]; then + # Detects if unbuffer command is available for 32 bit distributions only. + info_distro.sh + if [ $(command -v stdbuf) ]&&[ "${arch}" != "x86_64" ]; then unbuffer="stdbuf -i0 -o0 -e0" fi @@ -134,4 +138,4 @@ if [ -z "${autoinstall}" ]; then * ) echo "Please answer yes or no.";; esac done -fi \ No newline at end of file +fi diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh index 37b48781d..167daf5fb 100644 --- a/lgsm/functions/update_steamcmd.sh +++ b/lgsm/functions/update_steamcmd.sh @@ -19,8 +19,9 @@ fn_update_steamcmd_dl(){ cd "${rootdir}/steamcmd" - # Detects if unbuffer command is available. - if [ $(command -v stdbuf) ]; then + # Detects if unbuffer command is available for 32 bit distributions only. + info_distro.sh + if [ $(command -v stdbuf) ]&&[ "${arch}" != "x86_64" ]; then unbuffer="stdbuf -i0 -o0 -e0" fi diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 7a6b62b5d..0563e0556 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -1,60 +1,90 @@ #!/bin/bash -# TravisCI Tests: Just Cause 2 -# Server Management Script +# Just Cause 2 +# Project: Game Server Managers - LinuxGSM # Author: Daniel Gibbs +# License: MIT License, Copyright (c) 2016 Daniel Gibbs +# Purpose: TravisCI Test: Just Cause 2 | Server Management Script +# Contributors: https://github.com/GameServerManagers/LinuxGSM/graphs/contributors +# Documentation: https://github.com/GameServerManagers/LinuxGSM/wiki # Website: https://gameservermanagers.com -version="101716" +travistest=1 + +# Debugging if [ -f ".dev-debug" ]; then exec 5>dev-debug.log BASH_XTRACEFD="5" set -x fi -#### Variables #### +version="161113" -# Notification Alerts -# (on|off) +########################## +######## Settings ######## +########################## + +#### Server Settings #### +# No settings available for Just Cause 2 + +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters +# Edit with care +fn_parms(){ +parms="" +} + +#### LinuxGSM Settings #### -# Email +## Notification Alerts +# (on|off) +# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email emailalert="off" email="email@example.com" -#emailfrom="email@example.com" - -# Pushbullet -# https://www.pushbullet.com/#settings +emailfrom="" +# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Steam login -steamuser="anonymous" -steampass="" - -# Start Variables +## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" -fn_parms(){ -parms="" -} +## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" -#### Advanced Variables #### +## Logging | https://github.com/GameServerManagers/LinuxGSM/wiki/Logging +consolelogging="on" +logdays="7" + +#### LinuxGSM Advanced Settings #### + +## SteamCMD Settings +# Server appid +appid="261140" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta latest_experimental" +branch="" -# Github Branch Select +## Github Branch Select # Allows for the use of different function files # from a different repo and/or branch. githubuser="GameServerManagers" githubrepo="LinuxGSM" githubbranch="$TRAVIS_BRANCH" -# Steam -appid="261140" - -# Server Details -servicename="jc2-server" +## LinuxGSM Server Details +# Do not edit gamename="Just Cause 2" engine="avalanche" -# Directories +## Service Name | https://github.com/GameServerManagers/LinuxGSM/wiki/Multiple-Servers +servicename="jc2-server" + +#### Directories #### +# Edit with care + +## Work Directories rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))" selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" lockselfname=".${servicename}.lock" @@ -63,6 +93,8 @@ functionsdir="${lgsmdir}/functions" libdir="${lgsmdir}/lib" tmpdir="${lgsmdir}/tmp" filesdir="${rootdir}/serverfiles" + +## Server Specific Directories systemdir="${filesdir}" executabledir="${filesdir}" executable="./Jcmp-Server" @@ -70,24 +102,26 @@ servercfg="config.lua" servercfgdefault="config.lua" servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +## Backup Directory backupdir="${rootdir}/backups" -# Logging -logdays="7" +## Logging Directories #gamelogdir="" # No server logs available scriptlogdir="${rootdir}/log/script" consolelogdir="${rootdir}/log/console" -consolelogging="on" - scriptlog="${scriptlogdir}/${servicename}-script.log" consolelog="${consolelogdir}/${servicename}-console.log" emaillog="${scriptlogdir}/${servicename}-email.log" -scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%d-%m-%Y-%H-%M-%S').log" -consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M-%S').log" +## Logs Naming +scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" -##### Script ##### -# Do not edit +######################## +######## Script ######## +###### Do not edit ##### +######################## # Fetches core_dl for file downloads fn_fetch_core_dl(){ @@ -144,6 +178,17 @@ functionfile="${FUNCNAME}" fn_fetch_core_dl } +# Prevent from running this script as root. +if [ "$(whoami)" = "root" ]; then + if [ ! -f "${functionsdir}/core_functions.sh" ]||[ ! -f "${functionsdir}/check_root.sh" ]||[ ! -f "${functionsdir}/core_messages.sh" ]||[ ! -f "${functionsdir}/core_exit.sh" ]; then + echo "[ FAIL ] Do NOT run this script as root!" + exit 1 + else + core_functions.sh + check_root.sh + fi +fi + core_dl.sh core_functions.sh From 9bf74b80c266c92110029a1aa6333acec1580299 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Wed, 9 Nov 2016 01:34:54 +0100 Subject: [PATCH 16/23] executable hotfix for Rust | fixes #1171 --- Rust/rustserver | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Rust/rustserver b/Rust/rustserver index 6f34fadc3..6300440a0 100644 --- a/Rust/rustserver +++ b/Rust/rustserver @@ -116,7 +116,7 @@ filesdir="${rootdir}/serverfiles" ## Server Specific Directories systemdir="${filesdir}" executabledir="${filesdir}" -executable="./RustDedicated" +executable="LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`dirname $0`/RustDedicated_Data/Plugins/x86_64 ./RustDedicated" serveridentitydir="${systemdir}/server/${servicename}" servercfg="server.cfg" servercfgdefault="server.cfg" @@ -214,4 +214,4 @@ fi core_dl.sh core_functions.sh getopt=$1 -core_getopt.sh \ No newline at end of file +core_getopt.sh From abcb34ac535fcfc3d0b64786257694884108930d Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Mon, 7 Nov 2016 19:34:42 +0100 Subject: [PATCH 17/23] hotfix for ts3 server pass --- lgsm/functions/command_start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh index 57dcbfa60..30bbfccc8 100644 --- a/lgsm/functions/command_start.sh +++ b/lgsm/functions/command_start.sh @@ -37,7 +37,7 @@ fn_start_teamspeak3(){ date > "${rootdir}/${lockselfname}" cd "${executabledir}" if [ "${ts3serverpass}" == "1" ];then - ./ts3server_startscript.sh start serveradmin_password="${newpassword}" inifile="${servercfgfullpath}" + ./ts3server_startscript.sh start serveradmin_password="${newpassword}" inifile="${servercfgfullpath}" > /dev/null 2>&1 else ./ts3server_startscript.sh start inifile="${servercfgfullpath}" > /dev/null 2>&1 fi From 2ce6e91e44daee17e18f49dec05888e83ff96801 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Mon, 7 Nov 2016 19:33:50 +0100 Subject: [PATCH 18/23] hotfix for ts3 server pass Issue: other functions were triggering core_exit.sh Fix: bypass them bonus: better output Sample output: http://hastebin.com/quxulezila.rb --- lgsm/functions/command_ts3_server_pass.sh | 26 ++++++++++++----------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh index 89c3cd036..1a9896889 100644 --- a/lgsm/functions/command_ts3_server_pass.sh +++ b/lgsm/functions/command_ts3_server_pass.sh @@ -29,22 +29,17 @@ fn_serveradmin_password_prompt(){ done fn_script_log_info "Initiating ${gamename} ServerAdmin password change" read -p "Enter new password : " newpassword - } +} - fn_serveradmin_password_set(){ - fn_print_info_nl "Applying new password" - fn_script_log_info "Applying new password" +fn_serveradmin_password_set(){ + fn_print_info_nl "Starting server with new password..." + fn_script_log_info "Starting server with new password" sleep 1 - # Stop any running server - command_stop.sh # Start server in "new password mode" ts3serverpass="1" - fn_print_info_nl "Starting server with new password" + exitbypass="1" command_start.sh - # Stop server in "new password mode" - command_stop.sh - ts3serverpass="0" fn_print_ok_nl "Password applied" fn_script_log_pass "New ServerAdmin password applied" sleep 1 @@ -55,9 +50,16 @@ check.sh fn_serveradmin_password_prompt check_status.sh if [ "${status}" != "0" ]; then + # Stop any running server + exitbypass="1" + command_stop.sh fn_serveradmin_password_set - command_start.sh + ts3serverpass="0" + fn_print_info_nl "Restarting server normally" + fn_script_log_info "Restarting server normally" + command_restart.sh else fn_serveradmin_password_set + command_stop.sh fi -core_exit.sh \ No newline at end of file +core_exit.sh From 2ef211d0bc5c5b34b2f484fcb3a65757ac1488ae Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 18 Nov 2016 13:05:18 +0100 Subject: [PATCH 19/23] Check variables first & remove lockfile earlier --- lgsm/functions/command_backup.sh | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 34d014c42..8e18a619b 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -127,18 +127,20 @@ fn_backup_compression(){ fn_print_ok_nl "Completed: ${backupname}.tar.gz, total size $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}')" fn_script_log_pass "Backup created: ${backupname}.tar.gz, total size $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}')" fi + # Remove lock file + rm -f "${tmpdir}/.backup.lock" } # Clear old backups according to maxbackups and maxbackupdays variables fn_backup_prune(){ - # How many backups there are - info_distro.sh - # How many backups exceed maxbackups - backupquotadiff=$((backupcount-maxbackups)) - # How many backups exceed maxbackupdays - backupsoudatedcount=$(find "${backupdir}"/ -type f -name "*.tar.gz" -mtime +"${maxbackupdays}"|wc -l) - # If backup variables are set - if [ -n "${maxbackupdays}" ]&&[ -n "${maxbackups}" ]; then + # Clear if backup variables are set + if [ -n "${maxbackups}" ]&&[ -n "${maxbackupdays}" ]; then + # How many backups there are + info_distro.sh + # How many backups exceed maxbackups + backupquotadiff=$((backupcount-maxbackups)) + # How many backups exceed maxbackupdays + backupsoudatedcount=$(find "${backupdir}"/ -type f -name "*.tar.gz" -mtime +"${maxbackupdays}"|wc -l) # If anything can be cleared if [ "${backupquotadiff}" -gt "0" ]||[ "${backupsoudatedcount}" -gt "0" ]; then fn_print_dots "Pruning" @@ -195,8 +197,4 @@ fn_backup_dir fn_backup_compression fn_backup_prune fn_backup_start_server - -# Remove lock file -rm -f "${tmpdir}/.backup.lock" - core_exit.sh From 4092d492784f182b8850ef94e7f8eed3c816d775 Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Fri, 18 Nov 2016 16:22:41 +0100 Subject: [PATCH 20/23] Fixed Project Zomboid config handling - Corrected default config names - Use service name for config and "server name" - Added fn_check_cfgdir call to create non-existing config directory --- ProjectZomboid/pzserver | 8 ++++---- lgsm/functions/install_config.sh | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ProjectZomboid/pzserver b/ProjectZomboid/pzserver index 10fc6066c..6fbc80297 100644 --- a/ProjectZomboid/pzserver +++ b/ProjectZomboid/pzserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161113" +version="161118" ########################## ######## Settings ######## @@ -27,7 +27,7 @@ adminpassword="CHANGE_ME" ip="0.0.0.0" fn_parms(){ -parms="-ip ${ip} -adminpassword \"${adminpassword}\"" +parms="-ip ${ip} -adminpassword \"${adminpassword}\" -servername ${servicename}" } #### LinuxGSM Settings #### @@ -96,8 +96,8 @@ filesdir="${rootdir}/serverfiles" systemdir="${filesdir}" executabledir="${filesdir}" executable="./start-server.sh" -servercfg="server.ini" -servercfgdefault="server.cfg" +servercfg="${servicename}.ini" +servercfgdefault="server.ini" servercfgdir="${HOME}/Zomboid/Server" servercfgfullpath="${servercfgdir}/${servercfg}" diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 872618c1e..30292a276 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -298,6 +298,7 @@ elif [ "${gamename}" == "Pirates, Vikings, and Knights II" ]; then fn_set_config_vars elif [ "${gamename}" == "Project Zomboid" ]; then gamedirname="ProjectZomboid" + fn_check_cfgdir array_configs+=( server.ini ) fn_fetch_default_config fn_default_config_remote From 2d653e765354b2198ceae9ef41180d756eee7e3a Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 18 Nov 2016 16:16:13 +0000 Subject: [PATCH 21/23] Version to remain the same with hotfixes --- ProjectZomboid/pzserver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectZomboid/pzserver b/ProjectZomboid/pzserver index 6fbc80297..92f7170a6 100644 --- a/ProjectZomboid/pzserver +++ b/ProjectZomboid/pzserver @@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161118" +version="161113" ########################## ######## Settings ######## From 0f18a405edf84658044cd0b3b045b9ca1e8bf84c Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 18 Nov 2016 17:00:57 +0000 Subject: [PATCH 22/23] Removed Info about channeltags All info about the channeltag var is now on the wiki. It is now the standard method to have info relating to vars in the wiki rather than in the script. --- 7DaysToDie/sdtdserver | 3 --- ARKSurvivalEvolved/arkserver | 3 --- Arma3/arma3server | 3 --- Battlefield1942/bf1942server | 3 --- BlackMesa/bmdmserver | 3 --- BladeSymphony/bsserver | 3 --- BrainBread2/bb2server | 3 --- CallOfDuty/codserver | 3 --- CallOfDuty2/cod2server | 1 + CodenameCURE/ccserver | 3 --- CounterStrike/csserver | 3 --- CounterStrikeConditionZero/csczserver | 3 --- CounterStrikeGlobalOffensive/csgoserver | 3 --- CounterStrikeSource/cssserver | 3 --- DayOfDefeat/dodserver | 3 --- DayOfDefeatSource/dodsserver | 3 --- DayOfInfamy/doiserver | 3 --- DeathmatchClassic/dmcserver | 3 --- DontStarveTogether/dstserver | 3 --- DoubleActionBoogaloo/dabserver | 3 --- EmpiresMod/emserver | 3 --- FistfulOfFrags/fofserver | 3 --- GarrysMod/gmodserver | 3 --- GoldenEyeSource/gesserver | 3 --- HalfLife2Deathmatch/hl2dmserver | 3 --- HalfLifeDeathmatch/hldmserver | 3 --- HalfLifeDeathmatchSource/hldmsserver | 3 --- Hurtworld/hwserver | 3 --- Insurgency/insserver | 3 --- JustCause2/jc2server | 3 --- KillingFloor/kfserver | 3 --- Left4Dead/l4dserver | 3 --- Left4Dead2/l4d2server | 3 --- Minecraft/mcserver | 3 --- Mumble/mumbleserver | 3 --- NS2Combat/ns2cserver | 3 --- NaturalSelection2/ns2server | 3 --- NoMoreRoomInHell/nmrihserver | 3 --- OpposingForce/opforserver | 3 --- PiratesVikingandKnightsII/pvkiiserver | 3 --- ProjectZomboid/pzserver | 3 --- Quake2/q2server | 3 --- Quake3/q3server | 3 --- QuakeLive/qlserver | 3 --- QuakeWorld/qwserver | 3 --- RedOrchestra/roserver | 3 --- Ricochet/ricochetserver | 3 --- Rust/rustserver | 3 --- SeriousSam3BFE/ss3sserver | 3 --- Starbound/sbserver | 3 --- SvenCoop/svenserver | 3 --- TeamFortress2/tf2server | 3 --- TeamFortressClassic/tfcserver | 3 --- TeamSpeak3/ts3server | 3 --- Teeworlds/twserver | 3 --- Terraria/terrariaserver | 3 --- UnrealTournament/utserver | 3 --- UnrealTournament2004/ut2k4server | 3 --- UnrealTournament3/ut3server | 3 --- UnrealTournament99/ut99server | 3 --- WolfensteinEnemyTerritory/wetserver | 3 --- 61 files changed, 1 insertion(+), 180 deletions(-) diff --git a/7DaysToDie/sdtdserver b/7DaysToDie/sdtdserver index 5b835fd49..db4f71d04 100644 --- a/7DaysToDie/sdtdserver +++ b/7DaysToDie/sdtdserver @@ -46,9 +46,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/ARKSurvivalEvolved/arkserver b/ARKSurvivalEvolved/arkserver index 66fc67313..0f55c9182 100644 --- a/ARKSurvivalEvolved/arkserver +++ b/ARKSurvivalEvolved/arkserver @@ -48,9 +48,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/Arma3/arma3server b/Arma3/arma3server index 9532b6e65..ce61fb0a2 100644 --- a/Arma3/arma3server +++ b/Arma3/arma3server @@ -62,9 +62,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/Battlefield1942/bf1942server b/Battlefield1942/bf1942server index 46157e9d1..a42a8424d 100644 --- a/Battlefield1942/bf1942server +++ b/Battlefield1942/bf1942server @@ -38,9 +38,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/BlackMesa/bmdmserver b/BlackMesa/bmdmserver index d7d687882..323ee56c0 100644 --- a/BlackMesa/bmdmserver +++ b/BlackMesa/bmdmserver @@ -52,9 +52,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/BladeSymphony/bsserver b/BladeSymphony/bsserver index 73c3e2c27..f3ec8e51c 100644 --- a/BladeSymphony/bsserver +++ b/BladeSymphony/bsserver @@ -51,9 +51,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/BrainBread2/bb2server b/BrainBread2/bb2server index c594a5916..c7537e483 100644 --- a/BrainBread2/bb2server +++ b/BrainBread2/bb2server @@ -55,9 +55,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/CallOfDuty/codserver b/CallOfDuty/codserver index c16f06bbe..162c7e7cf 100755 --- a/CallOfDuty/codserver +++ b/CallOfDuty/codserver @@ -44,9 +44,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup diff --git a/CallOfDuty2/cod2server b/CallOfDuty2/cod2server index 58214c9c4..c032e42a0 100755 --- a/CallOfDuty2/cod2server +++ b/CallOfDuty2/cod2server @@ -45,6 +45,7 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" +channeltag="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" diff --git a/CodenameCURE/ccserver b/CodenameCURE/ccserver index b36a06d86..5f2524e53 100644 --- a/CodenameCURE/ccserver +++ b/CodenameCURE/ccserver @@ -45,9 +45,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/CounterStrike/csserver b/CounterStrike/csserver index 6006389be..0686a5e7c 100644 --- a/CounterStrike/csserver +++ b/CounterStrike/csserver @@ -46,9 +46,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/CounterStrikeConditionZero/csczserver b/CounterStrikeConditionZero/csczserver index a3a7ea5db..2f966f0bd 100644 --- a/CounterStrikeConditionZero/csczserver +++ b/CounterStrikeConditionZero/csczserver @@ -46,9 +46,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver index 7bc7b2bf7..144a06d9a 100755 --- a/CounterStrikeGlobalOffensive/csgoserver +++ b/CounterStrikeGlobalOffensive/csgoserver @@ -70,9 +70,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver index dc36768b9..93d2cdcdf 100644 --- a/CounterStrikeSource/cssserver +++ b/CounterStrikeSource/cssserver @@ -53,9 +53,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/DayOfDefeat/dodserver b/DayOfDefeat/dodserver index 51c0faedc..7346295dc 100644 --- a/DayOfDefeat/dodserver +++ b/DayOfDefeat/dodserver @@ -47,9 +47,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver index fea6dbf5c..402dbc983 100644 --- a/DayOfDefeatSource/dodsserver +++ b/DayOfDefeatSource/dodsserver @@ -47,9 +47,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/DayOfInfamy/doiserver b/DayOfInfamy/doiserver index 6b35f577e..00db47d6e 100644 --- a/DayOfInfamy/doiserver +++ b/DayOfInfamy/doiserver @@ -49,9 +49,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/DeathmatchClassic/dmcserver b/DeathmatchClassic/dmcserver index 793f9e1e2..bb41ab37b 100644 --- a/DeathmatchClassic/dmcserver +++ b/DeathmatchClassic/dmcserver @@ -46,9 +46,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/DontStarveTogether/dstserver b/DontStarveTogether/dstserver index b62687a0d..bdba108c0 100644 --- a/DontStarveTogether/dstserver +++ b/DontStarveTogether/dstserver @@ -45,9 +45,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/DoubleActionBoogaloo/dabserver b/DoubleActionBoogaloo/dabserver index e0d98c589..078811193 100644 --- a/DoubleActionBoogaloo/dabserver +++ b/DoubleActionBoogaloo/dabserver @@ -47,9 +47,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/EmpiresMod/emserver b/EmpiresMod/emserver index abcd6aaf3..14c7003cc 100644 --- a/EmpiresMod/emserver +++ b/EmpiresMod/emserver @@ -31,9 +31,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/FistfulOfFrags/fofserver b/FistfulOfFrags/fofserver index 0eaec5b02..6b5ff8e24 100644 --- a/FistfulOfFrags/fofserver +++ b/FistfulOfFrags/fofserver @@ -47,9 +47,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/GarrysMod/gmodserver b/GarrysMod/gmodserver index dc72af144..06a1fe896 100644 --- a/GarrysMod/gmodserver +++ b/GarrysMod/gmodserver @@ -62,9 +62,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/GoldenEyeSource/gesserver b/GoldenEyeSource/gesserver index 1a992a17a..c118daa39 100644 --- a/GoldenEyeSource/gesserver +++ b/GoldenEyeSource/gesserver @@ -47,9 +47,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/HalfLife2Deathmatch/hl2dmserver b/HalfLife2Deathmatch/hl2dmserver index 192823d5c..637c84f2a 100644 --- a/HalfLife2Deathmatch/hl2dmserver +++ b/HalfLife2Deathmatch/hl2dmserver @@ -47,9 +47,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/HalfLifeDeathmatch/hldmserver b/HalfLifeDeathmatch/hldmserver index 4a3054161..efabe345a 100644 --- a/HalfLifeDeathmatch/hldmserver +++ b/HalfLifeDeathmatch/hldmserver @@ -46,9 +46,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/HalfLifeDeathmatchSource/hldmsserver b/HalfLifeDeathmatchSource/hldmsserver index 55419cbdc..ad9538e42 100644 --- a/HalfLifeDeathmatchSource/hldmsserver +++ b/HalfLifeDeathmatchSource/hldmsserver @@ -47,9 +47,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/Hurtworld/hwserver b/Hurtworld/hwserver index 186520301..1aa96c147 100644 --- a/Hurtworld/hwserver +++ b/Hurtworld/hwserver @@ -59,9 +59,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/Insurgency/insserver b/Insurgency/insserver index 9f27f05b2..4476c6333 100644 --- a/Insurgency/insserver +++ b/Insurgency/insserver @@ -49,9 +49,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/JustCause2/jc2server b/JustCause2/jc2server index 42c9174d8..8eeb52ef0 100644 --- a/JustCause2/jc2server +++ b/JustCause2/jc2server @@ -41,9 +41,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/KillingFloor/kfserver b/KillingFloor/kfserver index f4e1bd9b7..5b3176db3 100644 --- a/KillingFloor/kfserver +++ b/KillingFloor/kfserver @@ -49,9 +49,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/Left4Dead/l4dserver b/Left4Dead/l4dserver index c20702057..a232ec03d 100644 --- a/Left4Dead/l4dserver +++ b/Left4Dead/l4dserver @@ -46,9 +46,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server index 43c90bd78..3e29ecc02 100644 --- a/Left4Dead2/l4d2server +++ b/Left4Dead2/l4d2server @@ -46,9 +46,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/Minecraft/mcserver b/Minecraft/mcserver index ca10d60bf..45bd0da07 100644 --- a/Minecraft/mcserver +++ b/Minecraft/mcserver @@ -41,9 +41,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/Mumble/mumbleserver b/Mumble/mumbleserver index 70d80981f..f4ac59740 100644 --- a/Mumble/mumbleserver +++ b/Mumble/mumbleserver @@ -40,9 +40,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/NS2Combat/ns2cserver b/NS2Combat/ns2cserver index 20315afcc..b839d1039 100644 --- a/NS2Combat/ns2cserver +++ b/NS2Combat/ns2cserver @@ -58,9 +58,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/NaturalSelection2/ns2server b/NaturalSelection2/ns2server index 5a360acc3..d672cdb1d 100644 --- a/NaturalSelection2/ns2server +++ b/NaturalSelection2/ns2server @@ -58,9 +58,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/NoMoreRoomInHell/nmrihserver b/NoMoreRoomInHell/nmrihserver index 1b2d1518b..5937fc1db 100644 --- a/NoMoreRoomInHell/nmrihserver +++ b/NoMoreRoomInHell/nmrihserver @@ -52,9 +52,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/OpposingForce/opforserver b/OpposingForce/opforserver index 797b6bbd4..00e7ee919 100644 --- a/OpposingForce/opforserver +++ b/OpposingForce/opforserver @@ -46,9 +46,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/PiratesVikingandKnightsII/pvkiiserver b/PiratesVikingandKnightsII/pvkiiserver index b5eebef48..81f73ac9d 100644 --- a/PiratesVikingandKnightsII/pvkiiserver +++ b/PiratesVikingandKnightsII/pvkiiserver @@ -47,9 +47,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/ProjectZomboid/pzserver b/ProjectZomboid/pzserver index a6cea666c..b6c18b7ab 100644 --- a/ProjectZomboid/pzserver +++ b/ProjectZomboid/pzserver @@ -41,9 +41,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/Quake2/q2server b/Quake2/q2server index 345d955cf..571a6d9e1 100644 --- a/Quake2/q2server +++ b/Quake2/q2server @@ -42,9 +42,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup diff --git a/Quake3/q3server b/Quake3/q3server index 1f019b8d3..84e86056a 100644 --- a/Quake3/q3server +++ b/Quake3/q3server @@ -43,9 +43,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup diff --git a/QuakeLive/qlserver b/QuakeLive/qlserver index c3d86ada1..332cf1e87 100755 --- a/QuakeLive/qlserver +++ b/QuakeLive/qlserver @@ -50,9 +50,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/QuakeWorld/qwserver b/QuakeWorld/qwserver index b6f7d27a9..5e1bb60de 100644 --- a/QuakeWorld/qwserver +++ b/QuakeWorld/qwserver @@ -24,9 +24,6 @@ email="email@example.com" # https://www.pushbullet.com/#settings pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" # Start Variables diff --git a/RedOrchestra/roserver b/RedOrchestra/roserver index 972efd81a..f8d8f88e5 100644 --- a/RedOrchestra/roserver +++ b/RedOrchestra/roserver @@ -47,9 +47,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/Ricochet/ricochetserver b/Ricochet/ricochetserver index 22949248b..f1ceeac69 100644 --- a/Ricochet/ricochetserver +++ b/Ricochet/ricochetserver @@ -70,9 +70,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/Rust/rustserver b/Rust/rustserver index 7b276f9df..c4c1362fd 100644 --- a/Rust/rustserver +++ b/Rust/rustserver @@ -62,9 +62,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/SeriousSam3BFE/ss3sserver b/SeriousSam3BFE/ss3sserver index 9b96dc7f1..ce7d58658 100644 --- a/SeriousSam3BFE/ss3sserver +++ b/SeriousSam3BFE/ss3sserver @@ -42,9 +42,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/Starbound/sbserver b/Starbound/sbserver index fc66dce94..eeecfb816 100644 --- a/Starbound/sbserver +++ b/Starbound/sbserver @@ -46,9 +46,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/SvenCoop/svenserver b/SvenCoop/svenserver index 429555ef4..ea2558ef3 100644 --- a/SvenCoop/svenserver +++ b/SvenCoop/svenserver @@ -46,9 +46,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/TeamFortress2/tf2server b/TeamFortress2/tf2server index 43b6080d9..440757827 100644 --- a/TeamFortress2/tf2server +++ b/TeamFortress2/tf2server @@ -50,9 +50,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/TeamFortressClassic/tfcserver b/TeamFortressClassic/tfcserver index 0da836111..a9679165e 100644 --- a/TeamFortressClassic/tfcserver +++ b/TeamFortressClassic/tfcserver @@ -46,9 +46,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/TeamSpeak3/ts3server b/TeamSpeak3/ts3server index b74afd002..bed364a8f 100644 --- a/TeamSpeak3/ts3server +++ b/TeamSpeak3/ts3server @@ -34,9 +34,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/Teeworlds/twserver b/Teeworlds/twserver index 3f8e1291c..61f3b9ba6 100644 --- a/Teeworlds/twserver +++ b/Teeworlds/twserver @@ -46,9 +46,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/Terraria/terrariaserver b/Terraria/terrariaserver index 9bbe56477..539e734ff 100644 --- a/Terraria/terrariaserver +++ b/Terraria/terrariaserver @@ -46,9 +46,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update diff --git a/UnrealTournament/utserver b/UnrealTournament/utserver index 54b67e329..06fa13dea 100644 --- a/UnrealTournament/utserver +++ b/UnrealTournament/utserver @@ -48,9 +48,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup diff --git a/UnrealTournament2004/ut2k4server b/UnrealTournament2004/ut2k4server index dd4c24931..e7cd59dbf 100644 --- a/UnrealTournament2004/ut2k4server +++ b/UnrealTournament2004/ut2k4server @@ -43,9 +43,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup diff --git a/UnrealTournament3/ut3server b/UnrealTournament3/ut3server index 5f5dd2c8b..f72a0e452 100644 --- a/UnrealTournament3/ut3server +++ b/UnrealTournament3/ut3server @@ -54,9 +54,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup diff --git a/UnrealTournament99/ut99server b/UnrealTournament99/ut99server index 41f9425f4..3e3ea17e4 100644 --- a/UnrealTournament99/ut99server +++ b/UnrealTournament99/ut99server @@ -43,9 +43,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup diff --git a/WolfensteinEnemyTerritory/wetserver b/WolfensteinEnemyTerritory/wetserver index 91d2da13b..00b74c98b 100644 --- a/WolfensteinEnemyTerritory/wetserver +++ b/WolfensteinEnemyTerritory/wetserver @@ -42,9 +42,6 @@ emailfrom="" # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" -# Pushbullet Channel | Do not set unless the channel exists on the -# account associated with the access token. Set without using the '#' -# E.g: "thisisachanneltag" would push to #thisisachanneltag channeltag="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update From bdc36f544398cb3db56d51abfc3970b1f90a4439 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 18 Nov 2016 18:45:18 +0000 Subject: [PATCH 23/23] added missing return --- 7DaysToDie/sdtdserver | 1 + ARKSurvivalEvolved/arkserver | 1 + Arma3/arma3server | 1 + Battlefield1942/bf1942server | 1 + BlackMesa/bmdmserver | 1 + BladeSymphony/bsserver | 1 + BrainBread2/bb2server | 1 + CallOfDuty/codserver | 1 + CallOfDuty2/cod2server | 1 + CodenameCURE/ccserver | 1 + CounterStrike/csserver | 1 + CounterStrikeConditionZero/csczserver | 1 + CounterStrikeGlobalOffensive/csgoserver | 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 + Quake2/q2server | 1 + Quake3/q3server | 1 + QuakeLive/qlserver | 1 + RedOrchestra/roserver | 1 + Ricochet/ricochetserver | 1 + Rust/rustserver | 1 + SeriousSam3BFE/ss3sserver | 1 + Starbound/sbserver | 1 + SvenCoop/svenserver | 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 + 61 files changed, 61 insertions(+) diff --git a/7DaysToDie/sdtdserver b/7DaysToDie/sdtdserver index db4f71d04..336b9c226 100644 --- a/7DaysToDie/sdtdserver +++ b/7DaysToDie/sdtdserver @@ -43,6 +43,7 @@ parms="-logfile ${gamelogdir}/output_log__`date +%Y-%m-%d__%H-%M-%S`.txt -quit - emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/ARKSurvivalEvolved/arkserver b/ARKSurvivalEvolved/arkserver index 0f55c9182..22a3c1c99 100644 --- a/ARKSurvivalEvolved/arkserver +++ b/ARKSurvivalEvolved/arkserver @@ -45,6 +45,7 @@ parms="\"TheIsland?listen?MultiHome=${ip}?SessionName=${servername}?MaxPlayers=$ emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/Arma3/arma3server b/Arma3/arma3server index ce61fb0a2..2f8fc8eca 100644 --- a/Arma3/arma3server +++ b/Arma3/arma3server @@ -59,6 +59,7 @@ parms="-netlog -ip=${ip} -port=${port} -cfg=${networkcfgfullpath} -config=${serv emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/Battlefield1942/bf1942server b/Battlefield1942/bf1942server index a42a8424d..14b25ef21 100644 --- a/Battlefield1942/bf1942server +++ b/Battlefield1942/bf1942server @@ -35,6 +35,7 @@ parms="+hostServer 1 +dedicated 1" emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/BlackMesa/bmdmserver b/BlackMesa/bmdmserver index 323ee56c0..988a2710b 100644 --- a/BlackMesa/bmdmserver +++ b/BlackMesa/bmdmserver @@ -49,6 +49,7 @@ parms="-game bms -strictportbind -ip ${ip} -port ${port} +clientport ${clientpor emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/BladeSymphony/bsserver b/BladeSymphony/bsserver index f3ec8e51c..d4a74617d 100644 --- a/BladeSymphony/bsserver +++ b/BladeSymphony/bsserver @@ -48,6 +48,7 @@ parms="-autoupdate -strictportbind -ip ${ip} -port ${port} +clientport ${clientp emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/BrainBread2/bb2server b/BrainBread2/bb2server index c7537e483..8c28607da 100644 --- a/BrainBread2/bb2server +++ b/BrainBread2/bb2server @@ -52,6 +52,7 @@ parms="-game brainbread2 -insecure -strictportbind -ip ${ip} -port ${port} +clie emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/CallOfDuty/codserver b/CallOfDuty/codserver index 162c7e7cf..4116d1ede 100755 --- a/CallOfDuty/codserver +++ b/CallOfDuty/codserver @@ -41,6 +41,7 @@ parms="+set sv_punkbuster 0 +set fs_basepath ${filesdir} +set dedicated 1 +set n emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/CallOfDuty2/cod2server b/CallOfDuty2/cod2server index c032e42a0..bda00bd1d 100755 --- a/CallOfDuty2/cod2server +++ b/CallOfDuty2/cod2server @@ -42,6 +42,7 @@ parms="+set sv_punkbuster 0 +set fs_basepath ${filesdir} +set dedicated 1 +set n emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/CodenameCURE/ccserver b/CodenameCURE/ccserver index 5f2524e53..140a8fcdf 100644 --- a/CodenameCURE/ccserver +++ b/CodenameCURE/ccserver @@ -42,6 +42,7 @@ parms="-game cure -insecure -strictportbind -ip ${ip} -port ${port} +clientport emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/CounterStrike/csserver b/CounterStrike/csserver index 0686a5e7c..580e8f030 100644 --- a/CounterStrike/csserver +++ b/CounterStrike/csserver @@ -43,6 +43,7 @@ parms="-game cstrike -strictportbind +ip ${ip} -port ${port} +clientport ${clien emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/CounterStrikeConditionZero/csczserver b/CounterStrikeConditionZero/csczserver index 2f966f0bd..191333698 100644 --- a/CounterStrikeConditionZero/csczserver +++ b/CounterStrikeConditionZero/csczserver @@ -43,6 +43,7 @@ parms="-game czero -strictportbind +ip ${ip} -port ${port} +clientport ${clientp emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver index 144a06d9a..0c8667d52 100755 --- a/CounterStrikeGlobalOffensive/csgoserver +++ b/CounterStrikeGlobalOffensive/csgoserver @@ -67,6 +67,7 @@ parms="-game csgo -usercon -strictportbind -ip ${ip} -port ${port} +clientport $ emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver index 93d2cdcdf..764cdc23a 100644 --- a/CounterStrikeSource/cssserver +++ b/CounterStrikeSource/cssserver @@ -50,6 +50,7 @@ parms="-game cstrike -strictportbind -ip ${ip} -port ${port} +clientport ${clien emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/DayOfDefeat/dodserver b/DayOfDefeat/dodserver index 7346295dc..70bc02e9f 100644 --- a/DayOfDefeat/dodserver +++ b/DayOfDefeat/dodserver @@ -44,6 +44,7 @@ parms="-game dod -strictportbind +ip ${ip} -port ${port} +clientport ${clientpor emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver index 402dbc983..031c6a9d1 100644 --- a/DayOfDefeatSource/dodsserver +++ b/DayOfDefeatSource/dodsserver @@ -44,6 +44,7 @@ parms="-game dod -strictportbind -ip ${ip} -port ${port} +clientport ${clientpor emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/DayOfInfamy/doiserver b/DayOfInfamy/doiserver index 00db47d6e..11108c8d6 100644 --- a/DayOfInfamy/doiserver +++ b/DayOfInfamy/doiserver @@ -46,6 +46,7 @@ parms="-game doi -strictportbind -ip ${ip} -port ${port} +clientport ${clientpor emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/DeathmatchClassic/dmcserver b/DeathmatchClassic/dmcserver index bb41ab37b..a59e3a576 100644 --- a/DeathmatchClassic/dmcserver +++ b/DeathmatchClassic/dmcserver @@ -43,6 +43,7 @@ parms="-game dmc -strictportbind +ip ${ip} -port ${port} +clientport ${clientpor emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/DontStarveTogether/dstserver b/DontStarveTogether/dstserver index bdba108c0..d0d331e7c 100644 --- a/DontStarveTogether/dstserver +++ b/DontStarveTogether/dstserver @@ -42,6 +42,7 @@ parms="-console -cluster MyDediServer -shard Master" emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/DoubleActionBoogaloo/dabserver b/DoubleActionBoogaloo/dabserver index 078811193..622fbb8ef 100644 --- a/DoubleActionBoogaloo/dabserver +++ b/DoubleActionBoogaloo/dabserver @@ -44,6 +44,7 @@ parms="-strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_por emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/EmpiresMod/emserver b/EmpiresMod/emserver index 14c7003cc..caea83cbf 100644 --- a/EmpiresMod/emserver +++ b/EmpiresMod/emserver @@ -28,6 +28,7 @@ parms="-game empires -strictportbind -ip ${ip} -port ${port} +clientport ${clien emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/FistfulOfFrags/fofserver b/FistfulOfFrags/fofserver index 6b5ff8e24..3920a12ae 100644 --- a/FistfulOfFrags/fofserver +++ b/FistfulOfFrags/fofserver @@ -44,6 +44,7 @@ parms="-game fof -strictportbind -ip ${ip} -port ${port} +clientport ${clientpor emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/GarrysMod/gmodserver b/GarrysMod/gmodserver index 06a1fe896..520a5c44c 100644 --- a/GarrysMod/gmodserver +++ b/GarrysMod/gmodserver @@ -59,6 +59,7 @@ parms="-game garrysmod -strictportbind -ip ${ip} -port ${port} -tickrate ${tickr emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/GoldenEyeSource/gesserver b/GoldenEyeSource/gesserver index c118daa39..7f7a41958 100644 --- a/GoldenEyeSource/gesserver +++ b/GoldenEyeSource/gesserver @@ -44,6 +44,7 @@ parms="-game gesource -strictportbind -ip ${ip} -port ${port} +clientport ${clie emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/HalfLife2Deathmatch/hl2dmserver b/HalfLife2Deathmatch/hl2dmserver index 637c84f2a..524026ac9 100644 --- a/HalfLife2Deathmatch/hl2dmserver +++ b/HalfLife2Deathmatch/hl2dmserver @@ -44,6 +44,7 @@ parms="-game hl2mp -strictportbind -ip ${ip} -port ${port} +clientport ${clientp emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/HalfLifeDeathmatch/hldmserver b/HalfLifeDeathmatch/hldmserver index efabe345a..41598e749 100644 --- a/HalfLifeDeathmatch/hldmserver +++ b/HalfLifeDeathmatch/hldmserver @@ -43,6 +43,7 @@ parms="-game valve -strictportbind +ip ${ip} -port ${port} +clientport ${clientp emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/HalfLifeDeathmatchSource/hldmsserver b/HalfLifeDeathmatchSource/hldmsserver index ad9538e42..bd6040c13 100644 --- a/HalfLifeDeathmatchSource/hldmsserver +++ b/HalfLifeDeathmatchSource/hldmsserver @@ -44,6 +44,7 @@ parms="-game hl1mp -strictportbind -ip ${ip} -port ${port} +clientport ${clientp emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/Hurtworld/hwserver b/Hurtworld/hwserver index 1aa96c147..5297a7b86 100644 --- a/Hurtworld/hwserver +++ b/Hurtworld/hwserver @@ -56,6 +56,7 @@ parms="-batchmode -nographics -exec \"host ${port} ${map} ${loadsave};queryport emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/Insurgency/insserver b/Insurgency/insserver index 4476c6333..9566859ad 100644 --- a/Insurgency/insserver +++ b/Insurgency/insserver @@ -46,6 +46,7 @@ parms="-game insurgency -strictportbind -ip ${ip} -port ${port} +clientport ${cl emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/JustCause2/jc2server b/JustCause2/jc2server index 8eeb52ef0..12ec80d2a 100644 --- a/JustCause2/jc2server +++ b/JustCause2/jc2server @@ -38,6 +38,7 @@ parms="" emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/KillingFloor/kfserver b/KillingFloor/kfserver index 5b3176db3..9add98f45 100644 --- a/KillingFloor/kfserver +++ b/KillingFloor/kfserver @@ -46,6 +46,7 @@ parms="server ${defaultmap}?game=KFmod.KFGameType?VACSecured=true -nohomedir ini emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/Left4Dead/l4dserver b/Left4Dead/l4dserver index a232ec03d..9bc46b0ae 100644 --- a/Left4Dead/l4dserver +++ b/Left4Dead/l4dserver @@ -43,6 +43,7 @@ parms="-game left4dead -strictportbind -ip ${ip} -port ${port} +clientport ${cli emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server index 3e29ecc02..4519dadc7 100644 --- a/Left4Dead2/l4d2server +++ b/Left4Dead2/l4d2server @@ -43,6 +43,7 @@ parms="-game left4dead2 -strictportbind -ip ${ip} -port ${port} +clientport ${cl emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/Minecraft/mcserver b/Minecraft/mcserver index 45bd0da07..20a0504e9 100644 --- a/Minecraft/mcserver +++ b/Minecraft/mcserver @@ -38,6 +38,7 @@ parms="nogui" emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/Mumble/mumbleserver b/Mumble/mumbleserver index f4ac59740..369379b6d 100644 --- a/Mumble/mumbleserver +++ b/Mumble/mumbleserver @@ -37,6 +37,7 @@ parms="-fg -ini ${servercfgfullpath}" emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/NS2Combat/ns2cserver b/NS2Combat/ns2cserver index b839d1039..026fe02d7 100644 --- a/NS2Combat/ns2cserver +++ b/NS2Combat/ns2cserver @@ -55,6 +55,7 @@ parms="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/NaturalSelection2/ns2server b/NaturalSelection2/ns2server index d672cdb1d..0e2d61348 100644 --- a/NaturalSelection2/ns2server +++ b/NaturalSelection2/ns2server @@ -55,6 +55,7 @@ parms="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/NoMoreRoomInHell/nmrihserver b/NoMoreRoomInHell/nmrihserver index 5937fc1db..16cc645df 100644 --- a/NoMoreRoomInHell/nmrihserver +++ b/NoMoreRoomInHell/nmrihserver @@ -49,6 +49,7 @@ parms="-game nmrih -insecure -strictportbind -ip ${ip} -port ${port} +clientport emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/OpposingForce/opforserver b/OpposingForce/opforserver index 00e7ee919..c710ff015 100644 --- a/OpposingForce/opforserver +++ b/OpposingForce/opforserver @@ -43,6 +43,7 @@ parms="-game gearbox -strictportbind +ip ${ip} -port ${port} +clientport ${clien emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/PiratesVikingandKnightsII/pvkiiserver b/PiratesVikingandKnightsII/pvkiiserver index 81f73ac9d..ac18433b3 100644 --- a/PiratesVikingandKnightsII/pvkiiserver +++ b/PiratesVikingandKnightsII/pvkiiserver @@ -44,6 +44,7 @@ parms="-game pvkii -strictportbind -ip ${ip} -port ${port} +clientport ${clientp emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/ProjectZomboid/pzserver b/ProjectZomboid/pzserver index b6c18b7ab..5ea2c1e75 100644 --- a/ProjectZomboid/pzserver +++ b/ProjectZomboid/pzserver @@ -38,6 +38,7 @@ parms="-ip ${ip} -adminpassword \"${adminpassword}\" -servername ${servicename}" emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/Quake2/q2server b/Quake2/q2server index 571a6d9e1..719cd54ce 100644 --- a/Quake2/q2server +++ b/Quake2/q2server @@ -39,6 +39,7 @@ parms="+set dedicated 1 +set ip ${ip} +set port ${port} +exec ${servercfg} +set emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/Quake3/q3server b/Quake3/q3server index 84e86056a..772c2e640 100644 --- a/Quake3/q3server +++ b/Quake3/q3server @@ -40,6 +40,7 @@ parms="+set sv_punkbuster 0 +set fs_basepath ${filesdir} +set dedicated 1 +set c emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/QuakeLive/qlserver b/QuakeLive/qlserver index 332cf1e87..1e61e4481 100755 --- a/QuakeLive/qlserver +++ b/QuakeLive/qlserver @@ -47,6 +47,7 @@ parms="+set net_strict 1 +set net_ip ${ip} +set net_port ${port} +set fs_homepat emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/RedOrchestra/roserver b/RedOrchestra/roserver index f8d8f88e5..470cf4a75 100644 --- a/RedOrchestra/roserver +++ b/RedOrchestra/roserver @@ -44,6 +44,7 @@ parms="server ${defaultmap}?game=ROGame.ROTeamGame?VACSecured=true -nohomedir in emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/Ricochet/ricochetserver b/Ricochet/ricochetserver index f1ceeac69..c223f9e23 100644 --- a/Ricochet/ricochetserver +++ b/Ricochet/ricochetserver @@ -67,6 +67,7 @@ parms="" emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/Rust/rustserver b/Rust/rustserver index c4c1362fd..fb5b3ee83 100644 --- a/Rust/rustserver +++ b/Rust/rustserver @@ -59,6 +59,7 @@ fi emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/SeriousSam3BFE/ss3sserver b/SeriousSam3BFE/ss3sserver index ce7d58658..b39d37ee8 100644 --- a/SeriousSam3BFE/ss3sserver +++ b/SeriousSam3BFE/ss3sserver @@ -39,6 +39,7 @@ parms="+ip ${ip} +logfile ${gamelog} +exec ${servercfgfullpath}" emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/Starbound/sbserver b/Starbound/sbserver index eeecfb816..8d1044f62 100644 --- a/Starbound/sbserver +++ b/Starbound/sbserver @@ -43,6 +43,7 @@ parms="" emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/SvenCoop/svenserver b/SvenCoop/svenserver index ea2558ef3..5c3c38ce9 100644 --- a/SvenCoop/svenserver +++ b/SvenCoop/svenserver @@ -43,6 +43,7 @@ parms="-game svencoop -strictportbind +ip ${ip} -port ${port} +clientport ${clie emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/TeamFortress2/tf2server b/TeamFortress2/tf2server index 440757827..37685fb22 100644 --- a/TeamFortress2/tf2server +++ b/TeamFortress2/tf2server @@ -47,6 +47,7 @@ parms="-game tf -strictportbind -ip ${ip} -port ${port} +clientport ${clientport emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/TeamFortressClassic/tfcserver b/TeamFortressClassic/tfcserver index a9679165e..9c67ebfed 100644 --- a/TeamFortressClassic/tfcserver +++ b/TeamFortressClassic/tfcserver @@ -43,6 +43,7 @@ parms="-game tfc -strictportbind _ip ${ip} -port ${port} +clientport ${clientpor emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/TeamSpeak3/ts3server b/TeamSpeak3/ts3server index bed364a8f..5a877436a 100644 --- a/TeamSpeak3/ts3server +++ b/TeamSpeak3/ts3server @@ -31,6 +31,7 @@ version="161113" emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/Teeworlds/twserver b/Teeworlds/twserver index 61f3b9ba6..870eddadf 100644 --- a/Teeworlds/twserver +++ b/Teeworlds/twserver @@ -43,6 +43,7 @@ parms="-f ${servercfgfullpath}" emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/Terraria/terrariaserver b/Terraria/terrariaserver index 539e734ff..43096a179 100644 --- a/Terraria/terrariaserver +++ b/Terraria/terrariaserver @@ -43,6 +43,7 @@ parms="-config ${servercfgfullpath}" emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/UnrealTournament/utserver b/UnrealTournament/utserver index 06fa13dea..aa558d79a 100644 --- a/UnrealTournament/utserver +++ b/UnrealTournament/utserver @@ -45,6 +45,7 @@ parms="UnrealTournament ${defaultmap}?Game=${gametype}?TimeLimit=${timelimit} -p emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/UnrealTournament2004/ut2k4server b/UnrealTournament2004/ut2k4server index e7cd59dbf..67c1a004c 100644 --- a/UnrealTournament2004/ut2k4server +++ b/UnrealTournament2004/ut2k4server @@ -40,6 +40,7 @@ parms="server ${defaultmap}?game=XGame.xDeathMatch -nohomedir ini=${servercfg} l emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/UnrealTournament3/ut3server b/UnrealTournament3/ut3server index f72a0e452..8c628597e 100644 --- a/UnrealTournament3/ut3server +++ b/UnrealTournament3/ut3server @@ -51,6 +51,7 @@ parms="server ${defaultmap}?Game=${game}?bIsDedicated=${isdedicated}?bIsLanMatch emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/UnrealTournament99/ut99server b/UnrealTournament99/ut99server index 3e3ea17e4..a401ed99c 100644 --- a/UnrealTournament99/ut99server +++ b/UnrealTournament99/ut99server @@ -40,6 +40,7 @@ parms="server ${defaultmap}.unr ini=${servercfgfullpath}" emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/WolfensteinEnemyTerritory/wetserver b/WolfensteinEnemyTerritory/wetserver index 00b74c98b..9eed5f28d 100644 --- a/WolfensteinEnemyTerritory/wetserver +++ b/WolfensteinEnemyTerritory/wetserver @@ -39,6 +39,7 @@ fn_parms(){ emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken" diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 0563e0556..27703ae21 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -40,6 +40,7 @@ parms="" emailalert="off" email="email@example.com" emailfrom="" + # Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet pushbulletalert="off" pushbullettoken="accesstoken"