From cb81b45f8e835e3fc13dcef39bfb3f596ece8b77 Mon Sep 17 00:00:00 2001 From: Jarkko R Date: Thu, 19 Jul 2018 20:26:07 +0300 Subject: [PATCH 01/47] Post Scriptum Server [Server Request] Postscriptum #1911 Added confighs for Post Scriptum server --- .../config-lgsm/pstbsserver/_default.cfg | 130 ++++++++++++++++++ lgsm/data/serverlist.csv | 1 + lgsm/functions/info_config.sh | 32 +++++ 3 files changed, 163 insertions(+) create mode 100644 lgsm/config-default/config-lgsm/pstbsserver/_default.cfg diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg new file mode 100644 index 0000000000..2de27df268 --- /dev/null +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -0,0 +1,130 @@ +################################## +######## Default Settings ######## +################################## +# DO NOT EDIT WILL BE OVERWRITTEN! +# Copy settings from here and use them in either +# common.cfg - applies settings to every instance +# [instance].cfg - applies settings to a specific instance + +#### Server Settings #### + +## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters +servername="LinuxGSM Server" +# If your server is not meeting the minimal server requirement, do not host the server for 80 players, decrease that number. +maxplayers="40" +numreservedslots="2" +port="10027" +queryport="10037" +randommap="ALWAYS" +ip="0.0.0.0" + +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters +fn_parms(){ +parms="MULTIHOME=${ip} RANDOM=${randommap} Port=${port} QueryPort=${queryport} ServerName=${servername} MaxPlayers=${maxplayers} NumReservedSlots=${numreservedslots}" +} + +#### LinuxGSM Settings #### + +## Notification Alerts +# (on|off) + +# More info | https://github.com/GameServerManagers/LinuxGSM/wiki/Alerts#more-info +postalert="off" +postdays="7" +posttarget="https://hastebin.com" + +# Discord Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Discord +discordalert="off" +discordwebhook="webhook" + +# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email +emailalert="off" +email="email@example.com" +emailfrom="" + +# IFTTT Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/IFTTT +iftttalert="off" +ifttttoken="accesstoken" +iftttevent="linuxgsm_alert" + +# Mailgun Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/mailgun +mailgunalert="off" +mailguntoken="accesstoken" +mailgundomain="example.com" +mailgunemailfrom="alert@example.com" +mailgunemail="email@myemail.com" + +# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet +pushbulletalert="off" +pushbullettoken="accesstoken" +channeltag="" + +# Pushover Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushover +pushoveralert="off" +pushovertoken="accesstoken" + +# Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. +telegramalert="off" +telegramtoken="accesstoken" +telegramchatid="" +curlcustomstring="" + +## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update +updateonstart="off" + +## 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" + +#### LinuxGSM Advanced Settings #### + +## SteamCMD Settings +# Server appid +appid="844650" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta latest_experimental" +branch="" + +## LinuxGSM Server Details +# Do not edit +gamename="pstbsserver" +engine="unreal4" + +#### Directories #### +# Edit with care + +## Server Specific Directories +systemdir="${serverfiles}/pstbsserver" +executabledir="${serverfiles}" +executable="./PostScriptumServer.sh" +servercfg="${servicename}.cfg" +servercfgdefault="Server.cfg" +servercfgdir="${systemdir}/ServerConfig" +servercfgfullpath="${servercfgdir}/${servercfg}" + +## Backup Directory +backupdir="${lgsmdir}/backup" + +## Logging Directories +logdir="${rootdir}/log" +gamelogdir="${systemdir}/Saved/Logs" +lgsmlogdir="${logdir}/script" +consolelogdir="${logdir}/console" +gamelog="${gamelogdir}/${servicename}-game.log" +lgsmlog="${lgsmlogdir}/${servicename}-script.log" +consolelog="${consolelogdir}/${servicename}-console.log" +alertlog="${lgsmlogdir}/${servicename}-alert.log" +postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" + +## Logs Naming +lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index 6f0a9efcb8..0517d7e074 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -80,3 +80,4 @@ vs,vsserver,Vampire Slayer wet,wetserver,Wolfenstein: Enemy Territory etl,etlserver,ET: Legacy zps,zpsserver,Zombie Panic! Source +pstbs,pstbsserver,Post Scriptum: The Bloody Seventh diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index b9ef232ff9..c0f7f30675 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -1021,6 +1021,35 @@ fn_info_config_stationeers(){ fi } +#Post Scriptum: The bloody Seventh +fn_info_config_pstbs(){ + if [ ! -f "${servercfgfullpath}" ]; then + servername="${unavailable}" + maxplayers="${unavailable}" + numreservedslots="${unavailable}" + else + servername="$(grep "ServerName=" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')" + maxplayers="$(grep "MaxPlayers=" "${servercfgfullpath}" | tr -cd '[:digit:]')" + numreservedslots="$(grep "NumReservedSlots=" "${servercfgfullpath}" | tr -cd '[:digit:]')" + fi + + if [ ! -f "${servercfgdir}/Rcon.cfg" ]; then + rconport=${unavailable} + rconpassword=${unavailable} + else + rconport=$(grep "Port=" "${servercfgdir}/Rcon.cfg" | tr -cd '[:digit:]') + rconpassword=$(grep "Password=" "${servercfgdir}/Rcon.cfg" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/Password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + fi + + rconport=${rconport:-"0"} + if [ -z "${rconpassword}" ]||[ ${#rconpassword} == 1 ]; then + rconpassword="NOT SET" + fi + servername=${servername:-"NOT SET"} + serverpassword=${serverpassword:-"NOT SET"} + maxplayers=${maxplayers:-"0"} + numreservedslots=${maxplayers:-"0"} + # ARK: Survival Evolved if [ "${gamename}" == "ARK: Survivial Evolved" ]; then fn_info_config_ark @@ -1137,4 +1166,7 @@ elif [ "${gamename}" == "Squad" ]; then # Stationeers elif [ "${gamename}" == "Stationeers" ]; then fn_info_config_stationeers + # Post Scriptum: The Bloody Seventh + elif [ "${gamename}" == "Post Scriptum: The Bloody Seventh" ]; then + fn_info_config_pstbs fi From c91ca34d5bb6990ee208ee42ba5ce75d25accc9a Mon Sep 17 00:00:00 2001 From: Jarkko R Date: Fri, 20 Jul 2018 21:06:08 +0300 Subject: [PATCH 02/47] Rearranged code --- lgsm/data/serverlist.csv | 2 +- lgsm/functions/info_config.sh | 64 ++++++++++++++++++----------------- 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index 0517d7e074..962cd77b6a 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -50,6 +50,7 @@ ns,nsserver,Natural Selection ns2,ns2server,Natural Selection 2 ns2c,ns2cserver,NS2: Combat opfor,opforserver,Opposing Force +pstbs,pstbsserver,Post Scriptum: The Bloody Seventh pvkii,pvkiiserver,Pirates Vikings & Knights II pc,pcserver,Project Cars pz,pzserver,Project Zomboid @@ -80,4 +81,3 @@ vs,vsserver,Vampire Slayer wet,wetserver,Wolfenstein: Enemy Territory etl,etlserver,ET: Legacy zps,zpsserver,Zombie Panic! Source -pstbs,pstbsserver,Post Scriptum: The Bloody Seventh diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index c0f7f30675..8b0cb29287 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -330,6 +330,35 @@ fn_info_config_minecraft(){ fi } +#Post Scriptum: The bloody Seventh +fn_info_config_pstbs(){ + if [ ! -f "${servercfgfullpath}" ]; then + servername="${unavailable}" + maxplayers="${unavailable}" + numreservedslots="${unavailable}" + else + servername="$(grep "ServerName=" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')" + maxplayers="$(grep "MaxPlayers=" "${servercfgfullpath}" | tr -cd '[:digit:]')" + numreservedslots="$(grep "NumReservedSlots=" "${servercfgfullpath}" | tr -cd '[:digit:]')" + fi + + if [ ! -f "${servercfgdir}/Rcon.cfg" ]; then + rconport=${unavailable} + rconpassword=${unavailable} + else + rconport=$(grep "Port=" "${servercfgdir}/Rcon.cfg" | tr -cd '[:digit:]') + rconpassword=$(grep "Password=" "${servercfgdir}/Rcon.cfg" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/Password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + fi + + rconport=${rconport:-"0"} + if [ -z "${rconpassword}" ]||[ ${#rconpassword} == 1 ]; then + rconpassword="NOT SET" + fi + servername=${servername:-"NOT SET"} + serverpassword=${serverpassword:-"NOT SET"} + maxplayers=${maxplayers:-"0"} + numreservedslots=${maxplayers:-"0"} + fn_info_config_projectcars(){ if [ ! -f "${servercfgfullpath}" ]; then @@ -1021,34 +1050,6 @@ fn_info_config_stationeers(){ fi } -#Post Scriptum: The bloody Seventh -fn_info_config_pstbs(){ - if [ ! -f "${servercfgfullpath}" ]; then - servername="${unavailable}" - maxplayers="${unavailable}" - numreservedslots="${unavailable}" - else - servername="$(grep "ServerName=" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')" - maxplayers="$(grep "MaxPlayers=" "${servercfgfullpath}" | tr -cd '[:digit:]')" - numreservedslots="$(grep "NumReservedSlots=" "${servercfgfullpath}" | tr -cd '[:digit:]')" - fi - - if [ ! -f "${servercfgdir}/Rcon.cfg" ]; then - rconport=${unavailable} - rconpassword=${unavailable} - else - rconport=$(grep "Port=" "${servercfgdir}/Rcon.cfg" | tr -cd '[:digit:]') - rconpassword=$(grep "Password=" "${servercfgdir}/Rcon.cfg" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/Password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - fi - - rconport=${rconport:-"0"} - if [ -z "${rconpassword}" ]||[ ${#rconpassword} == 1 ]; then - rconpassword="NOT SET" - fi - servername=${servername:-"NOT SET"} - serverpassword=${serverpassword:-"NOT SET"} - maxplayers=${maxplayers:-"0"} - numreservedslots=${maxplayers:-"0"} # ARK: Survival Evolved if [ "${gamename}" == "ARK: Survivial Evolved" ]; then @@ -1107,6 +1108,9 @@ elif [ "${gamename}" == "Quake Live" ]; then # Minecraft elif [ "${engine}" == "lwjgl2" ]; then fn_info_config_minecraft +# Post Scriptum: The Bloody Seventh +elif [ "${gamename}" == "Post Scriptum: The Bloody Seventh" ]; then + fn_info_config_pstbs # Project Cars elif [ "${gamename}" == "Project Cars" ]; then fn_info_config_projectcars @@ -1166,7 +1170,5 @@ elif [ "${gamename}" == "Squad" ]; then # Stationeers elif [ "${gamename}" == "Stationeers" ]; then fn_info_config_stationeers - # Post Scriptum: The Bloody Seventh - elif [ "${gamename}" == "Post Scriptum: The Bloody Seventh" ]; then - fn_info_config_pstbs + fi From 1143c941fadff52d7dc4ab5780ba22d9b9edcb63 Mon Sep 17 00:00:00 2001 From: Jarkko R Date: Sat, 21 Jul 2018 00:33:09 +0300 Subject: [PATCH 03/47] servername missing servername missing at start settings --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index 2de27df268..1632e6e7c4 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -17,6 +17,7 @@ port="10027" queryport="10037" randommap="ALWAYS" ip="0.0.0.0" +servername="LinuxGSM Post Scriptum Server" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ From 9300890b1dda1cf578a9c5c869b95db381580efc Mon Sep 17 00:00:00 2001 From: Jarkko R Date: Sat, 21 Jul 2018 01:51:52 +0300 Subject: [PATCH 04/47] End of file error fix /info_config.sh: line 1175: syntax error: unexpected end of file --- lgsm/functions/info_config.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 8b0cb29287..09c46d4dad 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -1170,5 +1170,4 @@ elif [ "${gamename}" == "Squad" ]; then # Stationeers elif [ "${gamename}" == "Stationeers" ]; then fn_info_config_stationeers - -fi +fi \ No newline at end of file From ac02f76af5e335fcd713d9aa01abcc68a5bee41b Mon Sep 17 00:00:00 2001 From: Jarkko R Date: Sat, 21 Jul 2018 01:54:16 +0300 Subject: [PATCH 05/47] Error fix again EOF --- lgsm/functions/info_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 09c46d4dad..55516de9c5 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -1170,4 +1170,4 @@ elif [ "${gamename}" == "Squad" ]; then # Stationeers elif [ "${gamename}" == "Stationeers" ]; then fn_info_config_stationeers -fi \ No newline at end of file +fi From 744fc34aae34fafcf648e11ea16e978f6805f7c5 Mon Sep 17 00:00:00 2001 From: Jarkko R Date: Sat, 21 Jul 2018 01:57:34 +0300 Subject: [PATCH 06/47] Again Same fix tryout EOF --- lgsm/functions/info_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 55516de9c5..09c46d4dad 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -1170,4 +1170,4 @@ elif [ "${gamename}" == "Squad" ]; then # Stationeers elif [ "${gamename}" == "Stationeers" ]; then fn_info_config_stationeers -fi +fi \ No newline at end of file From ece01ae5cbbcd9fc024d1c585092f29adf97a981 Mon Sep 17 00:00:00 2001 From: Jarkko R Date: Sat, 21 Jul 2018 02:11:00 +0300 Subject: [PATCH 07/47] Error fix Added missing bracket --- lgsm/functions/info_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 09c46d4dad..ee418ba3e2 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -358,7 +358,7 @@ fn_info_config_pstbs(){ serverpassword=${serverpassword:-"NOT SET"} maxplayers=${maxplayers:-"0"} numreservedslots=${maxplayers:-"0"} - +} fn_info_config_projectcars(){ if [ ! -f "${servercfgfullpath}" ]; then From 451bbdf6573e68679c5d2b7df9dce0947dfcad49 Mon Sep 17 00:00:00 2001 From: Jarkko R Date: Sat, 21 Jul 2018 03:28:55 +0300 Subject: [PATCH 08/47] Missing cfg file Fic1 Changed systemdir --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index 1632e6e7c4..306a70be26 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -104,7 +104,7 @@ engine="unreal4" # Edit with care ## Server Specific Directories -systemdir="${serverfiles}/pstbsserver" +systemdir="${serverfiles}/PostScriptum" executabledir="${serverfiles}" executable="./PostScriptumServer.sh" servercfg="${servicename}.cfg" From 8245f2e3ed8c59213b0e1c59a31ae4dab30c81dd Mon Sep 17 00:00:00 2001 From: Jarkko R Date: Sat, 21 Jul 2018 03:28:55 +0300 Subject: [PATCH 09/47] Missing cfg file Fix1 Changed systemdir --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index 1632e6e7c4..306a70be26 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -104,7 +104,7 @@ engine="unreal4" # Edit with care ## Server Specific Directories -systemdir="${serverfiles}/pstbsserver" +systemdir="${serverfiles}/PostScriptum" executabledir="${serverfiles}" executable="./PostScriptumServer.sh" servercfg="${servicename}.cfg" From e1364ce5e621b21ff7f26932ccdb0bf7aea58874 Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 04:12:13 +0300 Subject: [PATCH 10/47] Missing gfg fix2 --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index 306a70be26..1b830abedf 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -97,7 +97,7 @@ branch="" ## LinuxGSM Server Details # Do not edit -gamename="pstbsserver" +gamename="PostScriptum" engine="unreal4" #### Directories #### From 61812cad29b27e82cd93679774e90abd4a5b929d Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 12:07:07 +0300 Subject: [PATCH 11/47] Missing cfg 3 Changed serverlist param --- lgsm/data/serverlist.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index 962cd77b6a..d4464f6156 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -50,7 +50,7 @@ ns,nsserver,Natural Selection ns2,ns2server,Natural Selection 2 ns2c,ns2cserver,NS2: Combat opfor,opforserver,Opposing Force -pstbs,pstbsserver,Post Scriptum: The Bloody Seventh +pstbs,PostScriptum,Post Scriptum: The Bloody Seventh pvkii,pvkiiserver,Pirates Vikings & Knights II pc,pcserver,Project Cars pz,pzserver,Project Zomboid From befdf694e35b28df8936d31a5d261dd7f08e8d69 Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 12:07:07 +0300 Subject: [PATCH 12/47] Revert "Missing cfg 3" This reverts commit 61812cad29b27e82cd93679774e90abd4a5b929d. --- lgsm/data/serverlist.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index d4464f6156..962cd77b6a 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -50,7 +50,7 @@ ns,nsserver,Natural Selection ns2,ns2server,Natural Selection 2 ns2c,ns2cserver,NS2: Combat opfor,opforserver,Opposing Force -pstbs,PostScriptum,Post Scriptum: The Bloody Seventh +pstbs,pstbsserver,Post Scriptum: The Bloody Seventh pvkii,pvkiiserver,Pirates Vikings & Knights II pc,pcserver,Project Cars pz,pzserver,Project Zomboid From c062d0fdc899fe0d1a8ec48eb7938a0d75714457 Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 12:07:07 +0300 Subject: [PATCH 13/47] Revert "Revert "Missing cfg 3"" This reverts commit befdf694e35b28df8936d31a5d261dd7f08e8d69. --- lgsm/data/serverlist.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index 962cd77b6a..d4464f6156 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -50,7 +50,7 @@ ns,nsserver,Natural Selection ns2,ns2server,Natural Selection 2 ns2c,ns2cserver,NS2: Combat opfor,opforserver,Opposing Force -pstbs,pstbsserver,Post Scriptum: The Bloody Seventh +pstbs,PostScriptum,Post Scriptum: The Bloody Seventh pvkii,pvkiiserver,Pirates Vikings & Knights II pc,pcserver,Project Cars pz,pzserver,Project Zomboid From afd3dadeff64cabb65543a95b4cf26a6fcc45cfa Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 04:12:13 +0300 Subject: [PATCH 14/47] Revert "Missing gfg fix2" This reverts commit e1364ce5e621b21ff7f26932ccdb0bf7aea58874. --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index 1b830abedf..306a70be26 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -97,7 +97,7 @@ branch="" ## LinuxGSM Server Details # Do not edit -gamename="PostScriptum" +gamename="pstbsserver" engine="unreal4" #### Directories #### From a658b748b4534eecedca68924f757ea0f8f24e74 Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 12:07:07 +0300 Subject: [PATCH 15/47] Revert "Revert "Revert "Missing cfg 3""" This reverts commit c062d0fdc899fe0d1a8ec48eb7938a0d75714457. --- lgsm/data/serverlist.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index d4464f6156..962cd77b6a 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -50,7 +50,7 @@ ns,nsserver,Natural Selection ns2,ns2server,Natural Selection 2 ns2c,ns2cserver,NS2: Combat opfor,opforserver,Opposing Force -pstbs,PostScriptum,Post Scriptum: The Bloody Seventh +pstbs,pstbsserver,Post Scriptum: The Bloody Seventh pvkii,pvkiiserver,Pirates Vikings & Knights II pc,pcserver,Project Cars pz,pzserver,Project Zomboid From 9c88350be7d47d5d00e7b692d156ea12b3f2b91b Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 13:42:42 +0300 Subject: [PATCH 16/47] Auto stash before revert of "Revert "Revert "Missing cfg 3""" Server.cfg hardcoded --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index 306a70be26..25ea550dc2 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -107,7 +107,7 @@ engine="unreal4" systemdir="${serverfiles}/PostScriptum" executabledir="${serverfiles}" executable="./PostScriptumServer.sh" -servercfg="${servicename}.cfg" +servercfg="Server.cfg" servercfgdefault="Server.cfg" servercfgdir="${systemdir}/ServerConfig" servercfgfullpath="${servercfgdir}/${servercfg}" From 82e838def75419d4efbcc642567006f3d1f3b3da Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 15:59:14 +0300 Subject: [PATCH 17/47] Server game engine missing Added Infomessage handling for PS. --- lgsm/functions/info_messages.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index a5283c2f16..2cfc9ac89d 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -282,7 +282,7 @@ fn_info_message_gameserver(){ echo -e "${blue}ASE:\t${default}${saveinterval} s" fi - # Random map rotation mode (Squad) + # Random map rotation mode (Squad and Post Scriptum) if [ -n "${randommap}" ]; then echo -e "${blue}Map rotation:\t${default}${randommap}" fi @@ -693,6 +693,16 @@ fn_info_message_mumble(){ echo -e "> ServerQuery\tINBOUND\t${port}\ttcp" } | column -s $'\t' -t } +fn_info_message_pstbs(){ + echo -e "netstat -atunp | grep pstbsserver" + echo -e "" + { + echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" + echo -e "> Game\tINBOUND\t${port}\tudp" + echo -e "> Query\tINBOUND\t${queryport}\tudp" + echo -e "> RCON\tINBOUND\t${rconport}\ttcp" + } | column -s $'\t' -t +} fn_info_message_projectcars(){ echo -e "netstat -atunp | grep DedicatedS" @@ -1106,6 +1116,8 @@ fn_info_message_select_engine(){ fn_info_message_justcause3 elif [ "${shortname}" == "kf2" ]; then fn_info_message_kf2 + elif [ ${gamename}" == "Post Scriptum: The Bloody Seventh" ]; then + fn_info_Message_pstbs elif [ "${gamename}" == "Project Cars" ]; then fn_info_message_projectcars elif [ "${gamename}" == "QuakeWorld" ]; then From 1a225d9f7831b761e38cb572d995108670457eaa Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 16:12:03 +0300 Subject: [PATCH 18/47] Game engine missing fix2 Param name checking --- lgsm/functions/info_messages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 2cfc9ac89d..dba573c8c7 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -1116,7 +1116,7 @@ fn_info_message_select_engine(){ fn_info_message_justcause3 elif [ "${shortname}" == "kf2" ]; then fn_info_message_kf2 - elif [ ${gamename}" == "Post Scriptum: The Bloody Seventh" ]; then + elif [ ${gamename}" == "pstbsserver" ]; then fn_info_Message_pstbs elif [ "${gamename}" == "Project Cars" ]; then fn_info_message_projectcars From 566be7bfeb95fe57418c214e20432b0e7d570562 Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 16:44:19 +0300 Subject: [PATCH 19/47] Typo fix --- lgsm/functions/info_messages.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index dba573c8c7..15a46c97a9 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -1116,8 +1116,8 @@ fn_info_message_select_engine(){ fn_info_message_justcause3 elif [ "${shortname}" == "kf2" ]; then fn_info_message_kf2 - elif [ ${gamename}" == "pstbsserver" ]; then - fn_info_Message_pstbs + elif [ "${gamename}" == "pstbsserver" ]; then + fn_info_Message_pstbs elif [ "${gamename}" == "Project Cars" ]; then fn_info_message_projectcars elif [ "${gamename}" == "QuakeWorld" ]; then From 7c70a3a08dad552149e7996f5f7d836a898d68f5 Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 17:50:03 +0300 Subject: [PATCH 20/47] Param fix Removed double definition --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index 25ea550dc2..d767ba4cbc 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -17,7 +17,7 @@ port="10027" queryport="10037" randommap="ALWAYS" ip="0.0.0.0" -servername="LinuxGSM Post Scriptum Server" + ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ From db154a0ce3b0df95074190eef84a0ec878127840 Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 17:57:58 +0300 Subject: [PATCH 21/47] Cleaning default.cfg Minimal params left --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index d767ba4cbc..ee6a826fbb 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -9,10 +9,6 @@ #### Server Settings #### ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters -servername="LinuxGSM Server" -# If your server is not meeting the minimal server requirement, do not host the server for 80 players, decrease that number. -maxplayers="40" -numreservedslots="2" port="10027" queryport="10037" randommap="ALWAYS" @@ -21,7 +17,7 @@ ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="MULTIHOME=${ip} RANDOM=${randommap} Port=${port} QueryPort=${queryport} ServerName=${servername} MaxPlayers=${maxplayers} NumReservedSlots=${numreservedslots}" +parms="MULTIHOME=${ip} RANDOM=${randommap} Port=${port} QueryPort=${queryport}" } #### LinuxGSM Settings #### From 4c76a2835af94e12afcb518d1766659c5bca1d08 Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 17:57:58 +0300 Subject: [PATCH 22/47] Revert "Cleaning default.cfg" This reverts commit db154a0ce3b0df95074190eef84a0ec878127840. --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index ee6a826fbb..d767ba4cbc 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -9,6 +9,10 @@ #### Server Settings #### ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters +servername="LinuxGSM Server" +# If your server is not meeting the minimal server requirement, do not host the server for 80 players, decrease that number. +maxplayers="40" +numreservedslots="2" port="10027" queryport="10037" randommap="ALWAYS" @@ -17,7 +21,7 @@ ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="MULTIHOME=${ip} RANDOM=${randommap} Port=${port} QueryPort=${queryport}" +parms="MULTIHOME=${ip} RANDOM=${randommap} Port=${port} QueryPort=${queryport} ServerName=${servername} MaxPlayers=${maxplayers} NumReservedSlots=${numreservedslots}" } #### LinuxGSM Settings #### From 6c2401738759d23172e13e6319e6a8d03e0a60be Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 20:03:11 +0300 Subject: [PATCH 23/47] Testing params Servername --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index d767ba4cbc..6a70c31c11 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -21,7 +21,7 @@ ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="MULTIHOME=${ip} RANDOM=${randommap} Port=${port} QueryPort=${queryport} ServerName=${servername} MaxPlayers=${maxplayers} NumReservedSlots=${numreservedslots}" +parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port} ?QueryPort=${queryport} ServerName=${servername} MaxPlayers=${maxplayers} NumReservedSlots=${numreservedslots}" } #### LinuxGSM Settings #### From 39ffaa84bfdb918888f566170ea9f7c56e07bc7b Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 20:10:16 +0300 Subject: [PATCH 24/47] Params fix1 Syntax fixing --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index 6a70c31c11..4e91bed0b4 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -9,6 +9,7 @@ #### Server Settings #### ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters + servername="LinuxGSM Server" # If your server is not meeting the minimal server requirement, do not host the server for 80 players, decrease that number. maxplayers="40" @@ -21,7 +22,7 @@ ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port} ?QueryPort=${queryport} ServerName=${servername} MaxPlayers=${maxplayers} NumReservedSlots=${numreservedslots}" +parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?ServerName=${servername}?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}" } #### LinuxGSM Settings #### From 6b0926e4e1b2ff5cf453ced6d61e29fb089e59e8 Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 20:24:17 +0300 Subject: [PATCH 25/47] Typo Function name wrong --- lgsm/functions/info_messages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 15a46c97a9..4921a30714 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -693,7 +693,7 @@ fn_info_message_mumble(){ echo -e "> ServerQuery\tINBOUND\t${port}\ttcp" } | column -s $'\t' -t } -fn_info_message_pstbs(){ +fn_info_Message_pstbs(){ echo -e "netstat -atunp | grep pstbsserver" echo -e "" { From 17717966a0bc48ce9d3e9d3e6273bf5bfe521053 Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 21:02:10 +0300 Subject: [PATCH 26/47] Param fix 2 --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index 4e91bed0b4..e4e7e39b01 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -22,7 +22,7 @@ ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?ServerName=${servername}?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}" +parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?ServerName=${"servername"}?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}" } #### LinuxGSM Settings #### From 964975adba6a8ab715a12b413bafc9ca38a02b2e Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 21:14:49 +0300 Subject: [PATCH 27/47] Param fix 3 added ' ' --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index e4e7e39b01..70126d06bf 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -22,7 +22,7 @@ ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?ServerName=${"servername"}?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}" +parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?ServerName=${'servername'}?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}" } #### LinuxGSM Settings #### From 81d67304abdecc787e3679e1ecb8de0b3ace4d79 Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 21:22:33 +0300 Subject: [PATCH 28/47] Fixed to 2 --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index 70126d06bf..4e91bed0b4 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -22,7 +22,7 @@ ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?ServerName=${'servername'}?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}" +parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?ServerName=${servername}?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}" } #### LinuxGSM Settings #### From 0f7ceb375d8251bc2c68a0e3362c3232cb0e790b Mon Sep 17 00:00:00 2001 From: Troopie Date: Sat, 21 Jul 2018 23:55:36 +0300 Subject: [PATCH 29/47] Param fix4 added " " around servername --- .../config-lgsm/pstbsserver/_default.cfg | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index 4e91bed0b4..03b8d1799e 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -10,19 +10,18 @@ ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters -servername="LinuxGSM Server" +ip="0.0.0.0" +randommap="ALWAYS" +port="10027" +queryport="10037" +servername="LinuxGSM server" # If your server is not meeting the minimal server requirement, do not host the server for 80 players, decrease that number. maxplayers="40" numreservedslots="2" -port="10027" -queryport="10037" -randommap="ALWAYS" -ip="0.0.0.0" - ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?ServerName=${servername}?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}" +parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?ServerName=\"${servername}\"?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}" } #### LinuxGSM Settings #### From e30330b04480d9697fad60b43371c0696f166a9e Mon Sep 17 00:00:00 2001 From: Troopie Date: Sun, 22 Jul 2018 00:05:29 +0300 Subject: [PATCH 30/47] Remove servername modifying Removed from config --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index 03b8d1799e..f650477ba9 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -14,14 +14,14 @@ ip="0.0.0.0" randommap="ALWAYS" port="10027" queryport="10037" -servername="LinuxGSM server" +#servername="LinuxGSM server" # If your server is not meeting the minimal server requirement, do not host the server for 80 players, decrease that number. maxplayers="40" numreservedslots="2" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?ServerName=\"${servername}\"?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}" +parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}" } #### LinuxGSM Settings #### From 5bc8a45b98943df9ac10dea810809536c668bad9 Mon Sep 17 00:00:00 2001 From: Troopie Date: Sun, 22 Jul 2018 00:29:02 +0300 Subject: [PATCH 31/47] Cleaning config params Removed ip/Multihome --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index f650477ba9..73da66e667 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -10,7 +10,6 @@ ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters -ip="0.0.0.0" randommap="ALWAYS" port="10027" queryport="10037" @@ -21,7 +20,7 @@ numreservedslots="2" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}" +parms="RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}" } #### LinuxGSM Settings #### From d17f7c5e6c10332fdc61d029bc7fd580b2886132 Mon Sep 17 00:00:00 2001 From: Troopie Date: Sun, 22 Jul 2018 00:29:02 +0300 Subject: [PATCH 32/47] Revert "Cleaning config params" This reverts commit 5bc8a45b98943df9ac10dea810809536c668bad9. --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index 73da66e667..f650477ba9 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -10,6 +10,7 @@ ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters +ip="0.0.0.0" randommap="ALWAYS" port="10027" queryport="10037" @@ -20,7 +21,7 @@ numreservedslots="2" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}" +parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}" } #### LinuxGSM Settings #### From 06b1659184391aa0f6bc515750280c77b26ae2bb Mon Sep 17 00:00:00 2001 From: Troopie Date: Sun, 22 Jul 2018 14:13:15 +0300 Subject: [PATCH 33/47] Testing 1 Servername missing Added one "space" before closing ) --- lgsm/functions/info_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index ee418ba3e2..1863429db0 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -337,7 +337,7 @@ fn_info_config_pstbs(){ maxplayers="${unavailable}" numreservedslots="${unavailable}" else - servername="$(grep "ServerName=" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')" + servername="$(grep "ServerName=" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//' )" maxplayers="$(grep "MaxPlayers=" "${servercfgfullpath}" | tr -cd '[:digit:]')" numreservedslots="$(grep "NumReservedSlots=" "${servercfgfullpath}" | tr -cd '[:digit:]')" fi From ff56bb05211ef43353ff8840b5b3a14ad6c8c11b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Jul 2018 12:51:07 +0100 Subject: [PATCH 34/47] added minimum ram requirements for pstbs --- lgsm/functions/check_system_requirements.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lgsm/functions/check_system_requirements.sh b/lgsm/functions/check_system_requirements.sh index e0a3dbd010..dac412368f 100644 --- a/lgsm/functions/check_system_requirements.sh +++ b/lgsm/functions/check_system_requirements.sh @@ -12,19 +12,22 @@ info_distro.sh # RAM requirements in megabytes for each game or engine. -if [ "${gamename}" == "ARK: Survival Evolved" ]; then +if [ "${shortname}" == "ark" ]; then ramrequirementmb="4000" ramrequirementgb="4" -elif [ "${gamename}" == "ARMA 3" ]; then +elif [ "${shortname}" == "arma3" ]; then ramrequirementmb="1000" ramrequirementgb="1" -elif [ "${gamename}" == "Rust" ]; then +elif [ "${shortname}" == "rust" ]; then ramrequirementmb="4000" ramrequirementgb="4" -elif [ "${gamename}" == "Minecraft" ]; then +elif [ "${shortname}" == "mc" ]; then ramrequirementmb="1000" ramrequirementgb="1" -elif [ "${gamename}" == "Natural Selection 2" ]||[ "${gamename}" == "NS2: Combat" ]; then +elif [ "${shortname}" == "pstbs" ]; then + ramrequirementmb="1000" + ramrequirementgb="1" +elif [ "${shortname}" == "ns2" ]||[ "${shortname}" == "ns2c" ]; then ramrequirementmb="1000" ramrequirementgb="1" elif [ "${shortname}" == "st" ]; then From 0d394e803498df58186fc5af6a5c263614fe007f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Jul 2018 12:52:18 +0100 Subject: [PATCH 35/47] correction required 2G --- lgsm/functions/check_system_requirements.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/check_system_requirements.sh b/lgsm/functions/check_system_requirements.sh index dac412368f..ce961548d2 100644 --- a/lgsm/functions/check_system_requirements.sh +++ b/lgsm/functions/check_system_requirements.sh @@ -25,8 +25,8 @@ elif [ "${shortname}" == "mc" ]; then ramrequirementmb="1000" ramrequirementgb="1" elif [ "${shortname}" == "pstbs" ]; then - ramrequirementmb="1000" - ramrequirementgb="1" + ramrequirementmb="2000" + ramrequirementgb="2" elif [ "${shortname}" == "ns2" ]||[ "${shortname}" == "ns2c" ]; then ramrequirementmb="1000" ramrequirementgb="1" From 621d41fbd91a7c6011751293b7755a152d6d3c77 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Jul 2018 17:05:15 +0100 Subject: [PATCH 36/47] corrected missing servername --- lgsm/functions/info_config.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 1863429db0..bbf1266b8d 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -330,6 +330,7 @@ fn_info_config_minecraft(){ fi } + #Post Scriptum: The bloody Seventh fn_info_config_pstbs(){ if [ ! -f "${servercfgfullpath}" ]; then @@ -337,7 +338,7 @@ fn_info_config_pstbs(){ maxplayers="${unavailable}" numreservedslots="${unavailable}" else - servername="$(grep "ServerName=" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//' )" + servername="$(grep "ServerName=" "${servercfgfullpath}" | sed -e 's/^[ \t]//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=";,:' | sed -e 's/^[ \t]//' -e 's/[ \t]*$//')" maxplayers="$(grep "MaxPlayers=" "${servercfgfullpath}" | tr -cd '[:digit:]')" numreservedslots="$(grep "NumReservedSlots=" "${servercfgfullpath}" | tr -cd '[:digit:]')" fi @@ -1109,7 +1110,7 @@ elif [ "${gamename}" == "Quake Live" ]; then elif [ "${engine}" == "lwjgl2" ]; then fn_info_config_minecraft # Post Scriptum: The Bloody Seventh -elif [ "${gamename}" == "Post Scriptum: The Bloody Seventh" ]; then +elif [ "${shortname}" == "pstbs" ]; then fn_info_config_pstbs # Project Cars elif [ "${gamename}" == "Project Cars" ]; then From 95cf28917b59ef8d1024409280be03c835747ecb Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Jul 2018 17:08:54 +0100 Subject: [PATCH 37/47] updated glibc version --- lgsm/functions/info_glibc.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index 6d2ca4f20a..10b41313f4 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -90,6 +90,9 @@ elif [ "${gamename}" == "Project Cars" ]; then elif [ "${gamename}" == "Pirates, Vikings, and Knights II" ]; then glibcrequired="2.15" glibcfix="yes" +elif [ "${gamename}" == "pstbs" ]; then + glibcrequired="2.17" + glibcfix="no" elif [ "${gamename}" == "Quake 2" ]; then glibcrequired="NOT REQUIRED" glibcfix="no" From bf0ce40e49c742da60ed11f6b0a686e7a4c9dc76 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Jul 2018 17:10:33 +0100 Subject: [PATCH 38/47] shortname --- lgsm/functions/info_glibc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index 10b41313f4..e84d43b1c6 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -90,7 +90,7 @@ elif [ "${gamename}" == "Project Cars" ]; then elif [ "${gamename}" == "Pirates, Vikings, and Knights II" ]; then glibcrequired="2.15" glibcfix="yes" -elif [ "${gamename}" == "pstbs" ]; then +elif [ "${shortname}" == "pstbs" ]; then glibcrequired="2.17" glibcfix="no" elif [ "${gamename}" == "Quake 2" ]; then From 83dae2c6ce7220ff0f656d61aeff922db7f7c9aa Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Jul 2018 17:17:56 +0100 Subject: [PATCH 39/47] moved engine to the top. --- lgsm/functions/info_glibc.sh | 98 ++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index e84d43b1c6..d5152207ac 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -6,7 +6,55 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" -if [ "${gamename}" == "ARK: Survival Evolved" ]; then +if [ "${engine}" == "starbound" ]; then + glibcrequired="2.17" + glibcfix="no" +elif [ "${engine}" == "quake" ]; then + glibcrequired="2.0" + glibcfix="no" +elif [ "${engine}" == "terraria" ]; then + glibcrequired="2.7" + glibcfix="no" +elif [ "${engine}" == "unreal" ]; then + glibcrequired="2.1" + glibcfix="no" +elif [ "${engine}" == "unreal2" ]; then + glibcrequired="2.4" + glibcfix="no" +elif [ "${engine}" == "unreal3" ]; then + glibcrequired="2.3.2" + glibcfix="no" +elif [ "${engine}" == "unreal4" ]; then + glibcrequired="2.14" + glibcfix="no" +elif [ "${engine}" == "unity3d" ]; then + glibcrequired="2.15" + glibcfix="no" +elif [ "${engine}" == "dontstarve" ]; then + glibcrequired="2.15" + glibcfix="no" +elif [ "${engine}" == "lwjgl2" ]; then + glibcrequired="NOT REQUIRED" + glibcfix="no" +elif [ "${engine}" == "projectzomboid" ]; then + glibcrequired="2.15" + glibcfix="no" +elif [ "${engine}" == "realvirtuality" ]; then + glibcrequired="2.13" + glibcfix="yes" +elif [ "${engine}" == "seriousengine35" ]; then + glibcrequired="2.13" + glibcfix="yes" +elif [ "${engine}" == "source" ]; then + glibcrequired="2.3.6" + glibcfix="no" +elif [ "${engine}" == "goldsource" ]; then + glibcrequired="2.3.4" + glibcfix="no" +elif [ "${engine}" == "refractor" ]; then + glibcrequired="2.0" + glibcfix="no" +elif [ "${gamename}" == "ARK: Survival Evolved" ]; then glibcrequired="2.15" glibcfix="no" elif [ "${gamename}" == "Ballistic Overkill" ]; then @@ -129,66 +177,18 @@ elif [ "${gamename}" == "Just Cause 2" ]; then elif [ "${gamename}" == "Just Cause 3" ]; then glibcrequired="2.17" glibcfix="no" -elif [ "${engine}" == "dontstarve" ]; then - glibcrequired="2.15" - glibcfix="no" -elif [ "${engine}" == "lwjgl2" ]; then - glibcrequired="NOT REQUIRED" - glibcfix="no" -elif [ "${engine}" == "projectzomboid" ]; then - glibcrequired="2.15" - glibcfix="no" -elif [ "${engine}" == "realvirtuality" ]; then - glibcrequired="2.13" - glibcfix="yes" -elif [ "${engine}" == "seriousengine35" ]; then - glibcrequired="2.13" - glibcfix="yes" -elif [ "${engine}" == "source" ]; then - glibcrequired="2.3.6" - glibcfix="no" -elif [ "${engine}" == "goldsource" ]; then - glibcrequired="2.3.4" - glibcfix="no" elif [ "${gamename}" == "Natural Selection 2" ]; then glibcrequired="2.17" glibcfix="no" elif [ "${gamename}" == "NS2: Combat" ]; then glibcrequired="2.15" glibcfix="yes" -elif [ "${engine}" == "starbound" ]; then - glibcrequired="2.17" - glibcfix="no" -elif [ "${engine}" == "quake" ]; then - glibcrequired="2.0" - glibcfix="no" -elif [ "${engine}" == "terraria" ]; then - glibcrequired="2.7" - glibcfix="no" -elif [ "${engine}" == "unreal" ]; then - glibcrequired="2.1" - glibcfix="no" -elif [ "${engine}" == "unreal2" ]; then - glibcrequired="2.4" - glibcfix="no" -elif [ "${engine}" == "unreal3" ]; then - glibcrequired="2.3.2" - glibcfix="no" -elif [ "${engine}" == "unreal4" ]; then - glibcrequired="2.14" - glibcfix="no" -elif [ "${engine}" == "unity3d" ]; then - glibcrequired="2.15" - glibcfix="no" elif [ "${gamename}" == "TeamSpeak 3" ]; then glibcrequired="NOT REQUIRED" glibcfix="no" elif [ "${gamename}" == "Mumble" ]; then glibcrequired="NOT REQUIRED" glibcfix="no" -elif [ "${engine}" == "refractor" ]; then - glibcrequired="2.0" - glibcfix="no" elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then glibcrequired="2.2.4" glibcfix="no" From 4e0af4b082706b5dd132c533f711b8a857bcceba Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Jul 2018 17:17:56 +0100 Subject: [PATCH 40/47] Revert "moved engine to the top." This reverts commit 83dae2c6ce7220ff0f656d61aeff922db7f7c9aa. --- lgsm/functions/info_glibc.sh | 98 ++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index d5152207ac..e84d43b1c6 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -6,55 +6,7 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" -if [ "${engine}" == "starbound" ]; then - glibcrequired="2.17" - glibcfix="no" -elif [ "${engine}" == "quake" ]; then - glibcrequired="2.0" - glibcfix="no" -elif [ "${engine}" == "terraria" ]; then - glibcrequired="2.7" - glibcfix="no" -elif [ "${engine}" == "unreal" ]; then - glibcrequired="2.1" - glibcfix="no" -elif [ "${engine}" == "unreal2" ]; then - glibcrequired="2.4" - glibcfix="no" -elif [ "${engine}" == "unreal3" ]; then - glibcrequired="2.3.2" - glibcfix="no" -elif [ "${engine}" == "unreal4" ]; then - glibcrequired="2.14" - glibcfix="no" -elif [ "${engine}" == "unity3d" ]; then - glibcrequired="2.15" - glibcfix="no" -elif [ "${engine}" == "dontstarve" ]; then - glibcrequired="2.15" - glibcfix="no" -elif [ "${engine}" == "lwjgl2" ]; then - glibcrequired="NOT REQUIRED" - glibcfix="no" -elif [ "${engine}" == "projectzomboid" ]; then - glibcrequired="2.15" - glibcfix="no" -elif [ "${engine}" == "realvirtuality" ]; then - glibcrequired="2.13" - glibcfix="yes" -elif [ "${engine}" == "seriousengine35" ]; then - glibcrequired="2.13" - glibcfix="yes" -elif [ "${engine}" == "source" ]; then - glibcrequired="2.3.6" - glibcfix="no" -elif [ "${engine}" == "goldsource" ]; then - glibcrequired="2.3.4" - glibcfix="no" -elif [ "${engine}" == "refractor" ]; then - glibcrequired="2.0" - glibcfix="no" -elif [ "${gamename}" == "ARK: Survival Evolved" ]; then +if [ "${gamename}" == "ARK: Survival Evolved" ]; then glibcrequired="2.15" glibcfix="no" elif [ "${gamename}" == "Ballistic Overkill" ]; then @@ -177,18 +129,66 @@ elif [ "${gamename}" == "Just Cause 2" ]; then elif [ "${gamename}" == "Just Cause 3" ]; then glibcrequired="2.17" glibcfix="no" +elif [ "${engine}" == "dontstarve" ]; then + glibcrequired="2.15" + glibcfix="no" +elif [ "${engine}" == "lwjgl2" ]; then + glibcrequired="NOT REQUIRED" + glibcfix="no" +elif [ "${engine}" == "projectzomboid" ]; then + glibcrequired="2.15" + glibcfix="no" +elif [ "${engine}" == "realvirtuality" ]; then + glibcrequired="2.13" + glibcfix="yes" +elif [ "${engine}" == "seriousengine35" ]; then + glibcrequired="2.13" + glibcfix="yes" +elif [ "${engine}" == "source" ]; then + glibcrequired="2.3.6" + glibcfix="no" +elif [ "${engine}" == "goldsource" ]; then + glibcrequired="2.3.4" + glibcfix="no" elif [ "${gamename}" == "Natural Selection 2" ]; then glibcrequired="2.17" glibcfix="no" elif [ "${gamename}" == "NS2: Combat" ]; then glibcrequired="2.15" glibcfix="yes" +elif [ "${engine}" == "starbound" ]; then + glibcrequired="2.17" + glibcfix="no" +elif [ "${engine}" == "quake" ]; then + glibcrequired="2.0" + glibcfix="no" +elif [ "${engine}" == "terraria" ]; then + glibcrequired="2.7" + glibcfix="no" +elif [ "${engine}" == "unreal" ]; then + glibcrequired="2.1" + glibcfix="no" +elif [ "${engine}" == "unreal2" ]; then + glibcrequired="2.4" + glibcfix="no" +elif [ "${engine}" == "unreal3" ]; then + glibcrequired="2.3.2" + glibcfix="no" +elif [ "${engine}" == "unreal4" ]; then + glibcrequired="2.14" + glibcfix="no" +elif [ "${engine}" == "unity3d" ]; then + glibcrequired="2.15" + glibcfix="no" elif [ "${gamename}" == "TeamSpeak 3" ]; then glibcrequired="NOT REQUIRED" glibcfix="no" elif [ "${gamename}" == "Mumble" ]; then glibcrequired="NOT REQUIRED" glibcfix="no" +elif [ "${engine}" == "refractor" ]; then + glibcrequired="2.0" + glibcfix="no" elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then glibcrequired="2.2.4" glibcfix="no" From f3aea98809bebd96c6279df3c0f1f7fb3cd90ba2 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Jul 2018 17:34:03 +0100 Subject: [PATCH 41/47] Fixed bug displaying wrong glibc version --- lgsm/functions/info_glibc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index e84d43b1c6..86c57c4b8f 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -208,7 +208,7 @@ fi # Sets the SteamCMD GLIBC requirement if the game server requirement is less or not required. if [ -n "${appid}" ]; then - if [ "${glibcrequired}" = "NOT REQUIRED" ]||[ -z "${glibcrequired}" ]||[ "$(printf '%s\n'${glibcrequired}'\n' "${glibcversion}" | sort -V | head -n 1)" != "2.14" ]; then + if [ "${glibcrequired}" = "NOT REQUIRED" ]||[ -z "${glibcrequired}" ]||[ "$(printf '%s\n'${glibcrequired}'\n' "${glibcversion}" | sort -V | head -n 1)" =< "2.14" ]; then glibcrequired="2.14" glibcfix="no" fi From b5038087d8b56c34cb26e8e0ffd71460a0838e4f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Jul 2018 17:37:36 +0100 Subject: [PATCH 42/47] corrected netstat --- lgsm/functions/info_messages.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 4921a30714..c3a8509f2c 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -694,7 +694,7 @@ fn_info_message_mumble(){ } | column -s $'\t' -t } fn_info_Message_pstbs(){ - echo -e "netstat -atunp | grep pstbsserver" + echo -e "netstat -atunp | grep PostScriptum" echo -e "" { echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" @@ -1116,8 +1116,8 @@ fn_info_message_select_engine(){ fn_info_message_justcause3 elif [ "${shortname}" == "kf2" ]; then fn_info_message_kf2 - elif [ "${gamename}" == "pstbsserver" ]; then - fn_info_Message_pstbs + elif [ "${shortname}" == "pstbs" ]; then + fn_info_Message_pstbs elif [ "${gamename}" == "Project Cars" ]; then fn_info_message_projectcars elif [ "${gamename}" == "QuakeWorld" ]; then From 0e033f27f730f1ee0f2b5833da1e373271728af6 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Jul 2018 19:25:52 +0100 Subject: [PATCH 43/47] resolved confusion with glibc steamcmd selection --- lgsm/functions/info_glibc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index 86c57c4b8f..244b401c93 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -208,7 +208,7 @@ fi # Sets the SteamCMD GLIBC requirement if the game server requirement is less or not required. if [ -n "${appid}" ]; then - if [ "${glibcrequired}" = "NOT REQUIRED" ]||[ -z "${glibcrequired}" ]||[ "$(printf '%s\n'${glibcrequired}'\n' "${glibcversion}" | sort -V | head -n 1)" =< "2.14" ]; then + if [ "${glibcrequired}" = "NOT REQUIRED" ]||[ -z "${glibcrequired}" ]||[ "$(printf '%s\n'${glibcrequired}'\n' "2.14" | sort -V | head -n 1)" != "2.14" ]; then glibcrequired="2.14" glibcfix="no" fi From 79c33c6c169651678db29df775b076d3a7decf9b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Jul 2018 19:34:45 +0100 Subject: [PATCH 44/47] changed a word --- lgsm/functions/command_debug.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_debug.sh b/lgsm/functions/command_debug.sh index 270d23e5fb..c3d8d32d1a 100644 --- a/lgsm/functions/command_debug.sh +++ b/lgsm/functions/command_debug.sh @@ -44,7 +44,7 @@ if [ -n "${glibcrequired}" ]; then if [ "${glibcfix}" == "yes" ]; then echo -e "${blue}GLIBC required:\t${red}${glibcrequired} ${default}(${green}Using GLIBC fix${default})" else - echo -e "${blue}GLIBC required:\t${red}${glibcrequired} ${default}(${red}GLIBC version too old${default})" + echo -e "${blue}GLIBC required:\t${red}${glibcrequired} ${default}(${red}GLIBC distro version ${glibcversion} too old${default})" fi else echo -e "${blue}GLIBC required:\t${green}${glibcrequired}${default}" From 362bb72c384f744d48fec656ab19ed1797e8da4f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Jul 2018 20:35:03 +0100 Subject: [PATCH 45/47] missing nl --- lgsm/functions/fix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/fix.sh b/lgsm/functions/fix.sh index e67a0ab3f8..49fd5f16fe 100644 --- a/lgsm/functions/fix.sh +++ b/lgsm/functions/fix.sh @@ -84,7 +84,7 @@ if [ "${function_selfname}" == "command_install.sh" ]; then elif [ "${gamename}" == "Unreal Tournament 3" ]; then fix_ut3.sh else - fn_print_information "No fixes required." + fn_print_information_nl "No fixes required." fi fi From 3aee2793a791476229ab4d4f7596406887a93c66 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 10 Aug 2018 16:27:01 +0100 Subject: [PATCH 46/47] updated appid --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index f650477ba9..ef6550d5fe 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -89,7 +89,7 @@ logdays="7" ## SteamCMD Settings # Server appid -appid="844650" +appid="746200" # Steam App Branch Select # Allows to opt into the various Steam app branches. Default branch is "". # Example: "-beta latest_experimental" From ad4fb8c0e8dc25361cc41fd75546a5b362f4bf7d Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 10 Aug 2018 17:27:44 +0100 Subject: [PATCH 47/47] remove line --- lgsm/functions/info_config.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index bbf1266b8d..cf548f78d4 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -1051,7 +1051,6 @@ fn_info_config_stationeers(){ fi } - # ARK: Survival Evolved if [ "${gamename}" == "ARK: Survivial Evolved" ]; then fn_info_config_ark