From 360a9fcd3aceea8d2a8e9ba39d1a71de06b0c2ec Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 14 Nov 2018 22:40:24 +0000 Subject: [PATCH 01/26] StickyBots --- lgsm/data/serverlist.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index 12bb0532c..ca51313de 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -63,6 +63,7 @@ ricochet,ricochetserver,Ricochet rust,rustserver,Rust rw,rwserver, Rising World samp,sampserver,San Andreas Multiplayer +sbot,sbotserver, StickyBots ss3,ss3server,Serious Sam 3: BFE sb,sbserver,Starbound st,stserver,Stationeers From 9b4d5130be05e7a1ea6cbc83184ff17013818d6e Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 14 Nov 2018 22:46:39 +0000 Subject: [PATCH 02/26] sbotsserver config --- .../config-lgsm/sbotsserver/_default.cfg | 120 ++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 lgsm/config-default/config-lgsm/sbotsserver/_default.cfg diff --git a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg new file mode 100644 index 000000000..4c732e151 --- /dev/null +++ b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg @@ -0,0 +1,120 @@ +################################## +######## 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 + +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters +fn_parms(){ +parms="" +} + +#### 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="" + +## 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 #### + +# ANSI Colors +ansi="on" + +## SteamCMD Settings +# Server appid +appid="974130" +# 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="StickyBots" +engine="unreal4" + +#### Directories #### +# Edit with care + +## Server Specific Directories +systemdir="${serverfiles}" +executabledir="${systemdir}/blank1/Binaries/Linux" +executable="./blank1Server-Linux-Shipping" +servercfg="StickyBotsSettings.ini" +servercfgdir="${systemdir}/blank1/Config/Windows" +servercfgfullpath="${servercfgdir}/${servercfg}" + +## Backup Directory +backupdir="${rootdir}/backups" + +## Logging Directories +logdir="${rootdir}/log" +gamelogdir="${serverfiles}/Logs" +lgsmlogdir="${logdir}/script" +consolelogdir="${logdir}/console" +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" \ No newline at end of file From 1b7756a2f23cbcb3bdea3948d293b25d70354ab4 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 16 Nov 2018 21:57:00 +0000 Subject: [PATCH 03/26] sbots glibc --- 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 f3597cbf8..6179d99a4 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -114,6 +114,9 @@ elif [ "${gamename}" == "Squad" ]; then elif [ "${gamename}" == "Sven Co-op" ]; then glibcrequired="2.18" glibcfix="no" +elif [ "${shortname}" == "sbots" ]; then + glibcrequired="2.17" + glibcfix="no" elif [ "${gamename}" == "Team Fortress 2" ]; then glibcrequired="2.15" glibcfix="yes" From c5b3611171344c0712e529791ca8464611fdc638 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 16 Nov 2018 22:35:04 +0000 Subject: [PATCH 04/26] sbots info config --- lgsm/functions/info_config.sh | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 97ba4eb1d..ac78acda9 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -589,6 +589,36 @@ fn_info_config_seriousengine35(){ fi } +#StickyBots +fn_info_config_sbots(){ + 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_source(){ if [ ! -f "${servercfgfullpath}" ]; then servername="${unavailable}" @@ -1178,6 +1208,9 @@ elif [ "${gamename}" == "Mumble" ]; then # San Andreas Multiplayer elif [ "${gamename}" == "San Andreas Multiplayer" ]; then fn_info_config_samp +# StickyBots +elif [ "${shortname}" == "pstbs" ]; then + fn_info_config_sbots # Teeworlds elif [ "${engine}" == "teeworlds" ]; then fn_info_config_teeworlds From b44e58c45af028a7c59c560dcc4f98fe1400f453 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 16 Nov 2018 23:44:23 +0000 Subject: [PATCH 05/26] updated info config sbots --- lgsm/functions/info_config.sh | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index ac78acda9..87c084265 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -598,25 +598,11 @@ fn_info_config_sbots(){ 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_source(){ From 5d47101ac75a0da4f9b7a96e71940e5607dc9097 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 17 Nov 2018 00:30:05 +0000 Subject: [PATCH 06/26] tidy --- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 1 - lgsm/config-default/config-lgsm/squadserver/_default.cfg | 2 +- 2 files 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 8f472ce6b..a3aed4eec 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -9,7 +9,6 @@ #### Server Settings #### ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters - ip="0.0.0.0" randommap="ALWAYS" port="10027" diff --git a/lgsm/config-default/config-lgsm/squadserver/_default.cfg b/lgsm/config-default/config-lgsm/squadserver/_default.cfg index f2ef9badf..60284ca6f 100644 --- a/lgsm/config-default/config-lgsm/squadserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/squadserver/_default.cfg @@ -9,10 +9,10 @@ #### Server Settings #### ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters +ip="0.0.0.0" port="7787" queryport="27165" randommap="ALWAYS" -ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ From 89d85210f06d133ee64faf446890ee48d730fdc7 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 17 Nov 2018 00:31:34 +0000 Subject: [PATCH 07/26] sbots update --- lgsm/functions/info_config.sh | 1 - lgsm/functions/info_messages.sh | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 87c084265..abfb72833 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -594,7 +594,6 @@ fn_info_config_sbots(){ 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:]')" diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 996559796..e1a6b623e 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -717,7 +717,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 PostScriptum" echo -e "" { @@ -860,6 +860,16 @@ fn_info_message_seriousengine35(){ } | column -s $'\t' -t } +fn_info_message_sbots(){ + echo -e "netstat -atunp | grep blank1" + echo -e "" + { + echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" + echo -e "> Game\tINBOUND\t${port}\tudp" + echo -e "> Query\tINBOUND\t${queryport}\tudp" + } | column -s $'\t' -t +} + fn_info_message_sdtd(){ fn_info_message_password_strip echo -e "netstat -atunp | grep 7DaysToDie" @@ -1151,7 +1161,7 @@ fn_info_message_select_engine(){ elif [ "${shortname}" == "kf2" ]; then fn_info_message_kf2 elif [ "${shortname}" == "pstbs" ]; then - fn_info_Message_pstbs + fn_info_message_pstbs elif [ "${gamename}" == "Project Cars" ]; then fn_info_message_projectcars elif [ "${gamename}" == "QuakeWorld" ]; then @@ -1168,6 +1178,8 @@ fn_info_message_select_engine(){ fn_info_message_squad elif [ "${gamename}" == "Stationeers" ]; then fn_info_message_stationeers + elif [ "${shortname}" == "sbots" ]; then + fn_info_message_sbots elif [ "${gamename}" == "TeamSpeak 3" ]; then fn_info_message_teamspeak3 elif [ "${gamename}" == "Tower Unite" ]; then From 2d790dd74428ac1a291b365b468ac31310e44bc2 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 20 Nov 2018 19:41:02 +0000 Subject: [PATCH 08/26] Added stickybots parms --- lgsm/functions/info_parms.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh index 696ba8396..fe9576efc 100644 --- a/lgsm/functions/info_parms.sh +++ b/lgsm/functions/info_parms.sh @@ -124,6 +124,16 @@ fn_info_parms_spark(){ mods=${mods:-"NOT SET"} } +fn_info_parms_stickybots(){ + port=${port:-"0"} + queryport=${queryport:-"0"} + servername=${servername:-"NOT SET"} + serverpassword=${serverpassword:-"NOT SET"} + defaultmap=${defaultmap:-"NOT SET"} + defaultscenario=${defaultscenario:-"NOT SET"} + maxplayers=${maxplayers:-"0"} +} + fn_info_config_towerunite(){ port=${port:-"0"} queryport=${queryport:-"0"} @@ -184,6 +194,9 @@ elif [ "${gamename}" == "Rust" ]; then # Rising World elif [ "${shortname}" == "rw" ]; then fn_info_parms_risingworld +# Sticky Bots +elif [ "${shortname}" == "sbots" ]; then + fn_info_parms_stickybots # Serious Sam elif [ "${engine}" == "seriousengine35" ]; then fn_info_config_seriousengine35 From a85a5093ceb36e9f426d23ca1c60e8bca3bc7734 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 20 Nov 2018 19:50:32 +0000 Subject: [PATCH 09/26] corrected systemconfig dir --- lgsm/config-default/config-lgsm/sbotsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg index 4c732e151..90e5a5695 100644 --- a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg @@ -99,7 +99,7 @@ systemdir="${serverfiles}" executabledir="${systemdir}/blank1/Binaries/Linux" executable="./blank1Server-Linux-Shipping" servercfg="StickyBotsSettings.ini" -servercfgdir="${systemdir}/blank1/Config/Windows" +servercfgdir="${systemdir}/blank1/Saved/Config/Windows" servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory From c45e1ae0794318da7070d88983dd08416b0ce7c7 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 20 Nov 2018 21:37:40 +0000 Subject: [PATCH 10/26] added port parameters --- lgsm/config-default/config-lgsm/sbotsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg index 90e5a5695..7fb26f8a6 100644 --- a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg @@ -12,7 +12,7 @@ ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="" +parms="Port=${port}?QueryPort=${queryport}" } #### LinuxGSM Settings #### From 288b069f1baf98122dbcb1d58dcffcdddf62f4fa Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 20 Nov 2018 21:39:16 +0000 Subject: [PATCH 11/26] added parm vars --- lgsm/config-default/config-lgsm/sbotsserver/_default.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg index 7fb26f8a6..5fabdb61d 100644 --- a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg @@ -10,6 +10,9 @@ ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters +port="7777" +queryport="27015" + ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ parms="Port=${port}?QueryPort=${queryport}" From 36474484fed72078e2f7a3f2055951222d0cd2c1 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 20 Nov 2018 22:14:32 +0000 Subject: [PATCH 12/26] removed default scenario --- lgsm/functions/info_parms.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh index fe9576efc..3c4dc5e53 100644 --- a/lgsm/functions/info_parms.sh +++ b/lgsm/functions/info_parms.sh @@ -130,7 +130,6 @@ fn_info_parms_stickybots(){ servername=${servername:-"NOT SET"} serverpassword=${serverpassword:-"NOT SET"} defaultmap=${defaultmap:-"NOT SET"} - defaultscenario=${defaultscenario:-"NOT SET"} maxplayers=${maxplayers:-"0"} } From e200d124caa9ed6e952c724ec663e93c2da556b3 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 7 Dec 2018 19:16:47 +0000 Subject: [PATCH 13/26] added new start parameters --- lgsm/config-default/config-lgsm/sbotsserver/_default.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg index 5fabdb61d..2acf5aa78 100644 --- a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg @@ -9,13 +9,15 @@ #### Server Settings #### ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters - port="7777" queryport="27015" +defaultmap="Outpost" +servername="LinuxGSM Server (DE)" +maxplayers="8" # Can not be adjusted currently ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="Port=${port}?QueryPort=${queryport}" +parms="Port=${port}?QueryPort=${queryport} -startup_map '${defaultmap}' -server_name '${servername}'" } #### LinuxGSM Settings #### From d303a7cdad37b7f9fd416052d04b5ae32c46f7e2 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 7 Dec 2018 19:20:10 +0000 Subject: [PATCH 14/26] corrected servename --- lgsm/config-default/config-lgsm/sbotsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg index 2acf5aa78..7ced8c70e 100644 --- a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg @@ -12,7 +12,7 @@ port="7777" queryport="27015" defaultmap="Outpost" -servername="LinuxGSM Server (DE)" +servername="LinuxGSM Server" maxplayers="8" # Can not be adjusted currently ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters From 1b8ac56c283e25293b15a3b73189b769c6abed48 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 7 Dec 2018 19:20:21 +0000 Subject: [PATCH 15/26] added new start parameters corrected servername corrected servename --- lgsm/config-default/config-lgsm/sbotsserver/_default.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg index 5fabdb61d..7ced8c70e 100644 --- a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg @@ -9,13 +9,15 @@ #### Server Settings #### ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters - port="7777" queryport="27015" +defaultmap="Outpost" +servername="LinuxGSM Server" +maxplayers="8" # Can not be adjusted currently ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="Port=${port}?QueryPort=${queryport}" +parms="Port=${port}?QueryPort=${queryport} -startup_map '${defaultmap}' -server_name '${servername}'" } #### LinuxGSM Settings #### From 1e0ae7bd8c35a830d179117cc44a7b69aeae7381 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 7 Dec 2018 19:27:18 +0000 Subject: [PATCH 16/26] fix(details): resolve current game mode showing incorrectly --- lgsm/functions/info_messages.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index c9066c878..24821c9cd 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -231,7 +231,10 @@ fn_info_message_gameserver(){ echo -e "${blue}Current Scenario:\t${default}${gdgamemode}" fi else - echo -e "${blue}Current Game Mode:\t${default}${gdgamemode}" + # Current Scenario + if [ -n "${gdgamemode}" ]; then + echo -e "${blue}Current Game Mode:\t${default}${gdgamemode}" + fi fi # Default Map From 1ba7e7121e8f778d7181eebaed0e0a71143152ff Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 7 Dec 2018 19:28:05 +0000 Subject: [PATCH 17/26] refactor(details): change gamedig vars to unset if required --- lgsm/functions/query_gamedig.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lgsm/functions/query_gamedig.sh b/lgsm/functions/query_gamedig.sh index 1bdce107a..21e0ed091 100644 --- a/lgsm/functions/query_gamedig.sh +++ b/lgsm/functions/query_gamedig.sh @@ -89,37 +89,37 @@ if [ "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ]; # server name gdname=$(echo "${gamedigraw}" | jq -re '.name') if [ "${gdname}" == "null" ]; then - gdname= + unset gdname fi # numplayers gdplayers=$(echo "${gamedigraw}" | jq -re '.players|length') if [ "${gdplayers}" == "null" ]; then - gdplayers= + unset gdplayers fi # maxplayers gdmaxplayers=$(echo "${gamedigraw}" | jq -re '.maxplayers|length') if [ "${gdmaxplayers}" == "null" ]; then - maxplayers= + unset maxplayers fi # current map gdmap=$(echo "${gamedigraw}" | jq -re '.map') if [ "${gdmap}" == "null" ]; then - gdmap= + unset gdmap fi # current gamemode gdgamemode=$(echo "${gamedigraw}" | jq -re '.raw.rules.GameMode_s') if [ "${gdgamemode}" == "null" ]; then - gdgamemode= + unset gdgamemode fi # numbots gdbots=$(echo "${gamedigraw}" | jq -re '.raw.numbots') if [ "${gdbots}" == "null" ]; then - gdbots= + unset gdbots fi fi fi \ No newline at end of file From 667a410b3f5b2ee8a57253049d56da66d67f1709 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 7 Dec 2018 19:41:00 +0000 Subject: [PATCH 18/26] added serverpassword for future release --- lgsm/config-default/config-lgsm/sbotsserver/_default.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg index 7ced8c70e..304bbb689 100644 --- a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg @@ -13,7 +13,8 @@ port="7777" queryport="27015" defaultmap="Outpost" servername="LinuxGSM Server" -maxplayers="8" # Can not be adjusted currently +serverpassword="NOT SET" # Can't be adjusted currently +maxplayers="8" # Can't be adjusted currently ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ From 6d5fc73836499ef7ae38115c97ffb1381afcdbb9 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 7 Dec 2018 19:49:15 +0000 Subject: [PATCH 19/26] update parameters to use " --- lgsm/config-default/config-lgsm/sbotsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg index 304bbb689..6c536684f 100644 --- a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg @@ -18,7 +18,7 @@ maxplayers="8" # Can't be adjusted currently ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="Port=${port}?QueryPort=${queryport} -startup_map '${defaultmap}' -server_name '${servername}'" +parms="Port=${port}?QueryPort=${queryport} -startup_map \"${defaultmap}\" -server_name \"${servername}\"" } #### LinuxGSM Settings #### From 5950a2b1f81e825500376b0bec5372227a3572ea Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 7 Dec 2018 19:59:56 +0000 Subject: [PATCH 20/26] feat (game server): StickyBots Server --- .../config-lgsm/sbotsserver/_default.cfg | 7 +++++-- lgsm/functions/info_messages.sh | 5 ++++- lgsm/functions/query_gamedig.sh | 12 ++++++------ 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg index 5fabdb61d..6c536684f 100644 --- a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg @@ -9,13 +9,16 @@ #### Server Settings #### ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters - port="7777" queryport="27015" +defaultmap="Outpost" +servername="LinuxGSM Server" +serverpassword="NOT SET" # Can't be adjusted currently +maxplayers="8" # Can't be adjusted currently ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="Port=${port}?QueryPort=${queryport}" +parms="Port=${port}?QueryPort=${queryport} -startup_map \"${defaultmap}\" -server_name \"${servername}\"" } #### LinuxGSM Settings #### diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index c9066c878..24821c9cd 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -231,7 +231,10 @@ fn_info_message_gameserver(){ echo -e "${blue}Current Scenario:\t${default}${gdgamemode}" fi else - echo -e "${blue}Current Game Mode:\t${default}${gdgamemode}" + # Current Scenario + if [ -n "${gdgamemode}" ]; then + echo -e "${blue}Current Game Mode:\t${default}${gdgamemode}" + fi fi # Default Map diff --git a/lgsm/functions/query_gamedig.sh b/lgsm/functions/query_gamedig.sh index 1bdce107a..21e0ed091 100644 --- a/lgsm/functions/query_gamedig.sh +++ b/lgsm/functions/query_gamedig.sh @@ -89,37 +89,37 @@ if [ "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ]; # server name gdname=$(echo "${gamedigraw}" | jq -re '.name') if [ "${gdname}" == "null" ]; then - gdname= + unset gdname fi # numplayers gdplayers=$(echo "${gamedigraw}" | jq -re '.players|length') if [ "${gdplayers}" == "null" ]; then - gdplayers= + unset gdplayers fi # maxplayers gdmaxplayers=$(echo "${gamedigraw}" | jq -re '.maxplayers|length') if [ "${gdmaxplayers}" == "null" ]; then - maxplayers= + unset maxplayers fi # current map gdmap=$(echo "${gamedigraw}" | jq -re '.map') if [ "${gdmap}" == "null" ]; then - gdmap= + unset gdmap fi # current gamemode gdgamemode=$(echo "${gamedigraw}" | jq -re '.raw.rules.GameMode_s') if [ "${gdgamemode}" == "null" ]; then - gdgamemode= + unset gdgamemode fi # numbots gdbots=$(echo "${gamedigraw}" | jq -re '.raw.numbots') if [ "${gdbots}" == "null" ]; then - gdbots= + unset gdbots fi fi fi \ No newline at end of file From 08c6c7c3f5fe462e42c670fa8b72c8f20c0bccd5 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 7 Dec 2018 20:25:18 +0000 Subject: [PATCH 21/26] fix (game server): remove " as per recommendation --- lgsm/config-default/config-lgsm/sbotsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg index 6c536684f..8483a2e3a 100644 --- a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg @@ -18,7 +18,7 @@ maxplayers="8" # Can't be adjusted currently ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="Port=${port}?QueryPort=${queryport} -startup_map \"${defaultmap}\" -server_name \"${servername}\"" +parms="Port=${port}?QueryPort=${queryport} -startup_map ${defaultmap} -server_name \"${servername}\"" } #### LinuxGSM Settings #### From 5fa13ca221433079d698fe1e792375e0ecfde453 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 7 Dec 2018 20:40:12 +0000 Subject: [PATCH 22/26] refactor (game server): Corrected game config --- lgsm/config-default/config-lgsm/sbotsserver/_default.cfg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg index 8483a2e3a..fd3da3143 100644 --- a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg @@ -11,7 +11,7 @@ ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters port="7777" queryport="27015" -defaultmap="Outpost" +defaultmap="StationKappa" servername="LinuxGSM Server" serverpassword="NOT SET" # Can't be adjusted currently maxplayers="8" # Can't be adjusted currently @@ -104,7 +104,8 @@ engine="unreal4" systemdir="${serverfiles}" executabledir="${systemdir}/blank1/Binaries/Linux" executable="./blank1Server-Linux-Shipping" -servercfg="StickyBotsSettings.ini" +servercfg="Game.ini" +servercfgdefault="Game.ini" servercfgdir="${systemdir}/blank1/Saved/Config/Windows" servercfgfullpath="${servercfgdir}/${servercfg}" From a16b8c4a47e416470282756de755a183884cada9 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 7 Dec 2018 22:50:18 +0000 Subject: [PATCH 23/26] fix (sbotsserver): corrected servercfgdir location --- lgsm/config-default/config-lgsm/sbotsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg index fd3da3143..98d96a89d 100644 --- a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg @@ -106,7 +106,7 @@ executabledir="${systemdir}/blank1/Binaries/Linux" executable="./blank1Server-Linux-Shipping" servercfg="Game.ini" servercfgdefault="Game.ini" -servercfgdir="${systemdir}/blank1/Saved/Config/Windows" +servercfgdir="${systemdir}/blank1/Saved/Config/LinuxServer" servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory From c093fe94fe904ff15698dfe04d25dab450c9bc64 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 15 Dec 2018 14:59:03 +0000 Subject: [PATCH 24/26] fix(sbots): correct short and server name --- 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 497f37c8d..fd3fccbb8 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -64,7 +64,7 @@ ricochet,ricochetserver,Ricochet rust,rustserver,Rust rw,rwserver, Rising World samp,sampserver,San Andreas Multiplayer -sbot,sbotserver, StickyBots +sbots,sbotsserver, StickyBots ss3,ss3server,Serious Sam 3: BFE sb,sbserver,Starbound st,stserver,Stationeers From 989c1c142f1846ade9bf748b615ad7c8f14d2c89 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 15 Dec 2018 15:02:53 +0000 Subject: [PATCH 25/26] fix(check): correct if on line 434 --- lgsm/functions/check_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 87138fea7..09a13cdad 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -431,7 +431,7 @@ fn_deps_build_redhat(){ ## CentOS 6 if [ "${distroversion}" == "6" ]; then array_deps_required=( epel-release curl wget util-linux-ng python file gzip bzip2 unzip binutils bc jq ) - if [ "${distroversion}" == "7" ]; then + elif [ "${distroversion}" == "7" ]; then array_deps_required=( epel-release curl wget util-linux python file gzip bzip2 unzip binutils bc jq ) elif [ "${distroid}" == "fedora" ]; then array_deps_required=( curl wget util-linux python2 file gzip bzip2 unzip binutils bc jq ) From 0210503a66047c3dae7cc422ed636b3edc770d46 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 15 Dec 2018 19:56:39 +0000 Subject: [PATCH 26/26] feat(details): bots will not show if bots are 0 --- lgsm/functions/query_gamedig.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/query_gamedig.sh b/lgsm/functions/query_gamedig.sh index 21e0ed091..8fa8d1b45 100644 --- a/lgsm/functions/query_gamedig.sh +++ b/lgsm/functions/query_gamedig.sh @@ -118,7 +118,7 @@ if [ "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ]; # numbots gdbots=$(echo "${gamedigraw}" | jq -re '.raw.numbots') - if [ "${gdbots}" == "null" ]; then + if [ "${gdbots}" == "null" ]||[ "${gdbots}" == "0" ]; then unset gdbots fi fi