From fb69bafcd6b9cb4a7686402c6f9a13c99bb0fffa Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 2 Dec 2019 18:26:19 +0000 Subject: [PATCH 01/17] fix(legacy): add service name to core_legacy.sh --- lgsm/functions/core_legacy.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/functions/core_legacy.sh b/lgsm/functions/core_legacy.sh index 1b525b6696..c3efe7b631 100644 --- a/lgsm/functions/core_legacy.sh +++ b/lgsm/functions/core_legacy.sh @@ -41,6 +41,10 @@ if [ -z "${alertlog}" ]; then alertlog="${emaillog}" fi +if [ -z "${servicename}" ]; then + servicename="${selfname}" +fi + # Alternations to workshop variables. if [ -z "${wsapikey}" ]; then if [ "${workshopauth}" ]; then From 04ea539bcbd6b77ea200df053fe6e86be40347f9 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 5 Dec 2019 09:02:39 +0000 Subject: [PATCH 02/17] release v19.12.5 --- linuxgsm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linuxgsm.sh b/linuxgsm.sh index e7a7bc67ea..1a000656c6 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v19.12.4" +version="v19.12.5" shortname="core" gameservername="core" rootdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") From d09b2ed1055cd0cea81fc9a1ba717590ba91339a Mon Sep 17 00:00:00 2001 From: Frisasky Date: Thu, 5 Dec 2019 18:14:09 +0800 Subject: [PATCH 03/17] fix(rustserver): fix typo for rust wipe code (#2634) --- lgsm/functions/command_wipe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_wipe.sh b/lgsm/functions/command_wipe.sh index 0598699fbb..97b268e571 100644 --- a/lgsm/functions/command_wipe.sh +++ b/lgsm/functions/command_wipe.sh @@ -124,7 +124,7 @@ fn_wipe_server_remove_files(){ echo -en "Removing server misc srv.files*.db file(s)..." fn_sleep_time fn_script_log "${currentaction}" - find "${serveridentitydir:?}" -type f -name "sv.files.*.d" -delete + find "${serveridentitydir:?}" -type f -name "sv.files.*.db" -delete fn_wipe_exit_code fn_sleep_time # No further information if not found because it should I could not get this file showing up. From 18c6788536ab282cee6b46891fe1fee1ce127240 Mon Sep 17 00:00:00 2001 From: Frisasky Date: Tue, 10 Dec 2019 17:52:12 +0800 Subject: [PATCH 04/17] fix(doiserver): resolve server failing to restart without -norestart (#2651) --- lgsm/config-default/config-lgsm/doiserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/doiserver/_default.cfg b/lgsm/config-default/config-lgsm/doiserver/_default.cfg index 6dce5a1409..958e088f22 100644 --- a/lgsm/config-default/config-lgsm/doiserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/doiserver/_default.cfg @@ -19,7 +19,7 @@ tickrate="64" ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters fn_parms(){ -parms="-game doi -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers} -workshop" +parms="-game doi -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers} -workshop -norestart" } #### LinuxGSM Settings #### From ce2005ab6a5dbe42c79602e6c2174d8b9db5286b Mon Sep 17 00:00:00 2001 From: Frisasky Date: Tue, 7 Jan 2020 16:59:58 +0800 Subject: [PATCH 05/17] feat(post-details): change default post target from hastebin to termbin (#2645) --- lgsm/config-default/config-lgsm/ahl2server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/ahlserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/arkserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/arma3server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/bb2server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/bbserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/bdserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/bf1942server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/bmdmserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/boserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/bsserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/bt1944server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/btserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/ccserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/cod2server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/cod4server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/codserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/coduoserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/codwawserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/csczserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/csgoserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/csserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/cssserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/dabserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/dmcserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/dodserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/dodsserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/doiserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/dstserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/dysserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/ecoserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/emserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/etlserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/fctrserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/fofserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/gesserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/gmodserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/hldmserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/hldmsserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/hwserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/insserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/inssserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/iosserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/jc2server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/jc3server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/kf2server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/kfserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/l4d2server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/l4dserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/mcbserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/mcserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/mhserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/mohaaserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/mtaserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/mumbleserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/ndserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/nmrihserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/ns2cserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/ns2server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/nsserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/opforserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/pcserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/pzserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/q2server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/q3server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/qlserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/qwserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/ricochetserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/roserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/rtcwserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/rustserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/rwserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/sampserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/sbotsserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/sbserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/sdtdserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/sfcserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/sof2server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/solserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/squadserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/ss3server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/stserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/svenserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/terrariaserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/tf2server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/tfcserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/ts3server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/tsserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/tuserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/twserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/untserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/ut2k4server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/ut3server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/ut99server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/utserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/vsserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/wetserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/wfserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/wurmserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/zmrserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/zpsserver/_default.cfg | 2 +- lgsm/functions/command_postdetails.sh | 2 +- 105 files changed, 105 insertions(+), 105 deletions(-) diff --git a/lgsm/config-default/config-lgsm/ahl2server/_default.cfg b/lgsm/config-default/config-lgsm/ahl2server/_default.cfg index 9db6afe4a3..e9bac4a9cd 100644 --- a/lgsm/config-default/config-lgsm/ahl2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ahl2server/_default.cfg @@ -42,7 +42,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/ahlserver/_default.cfg b/lgsm/config-default/config-lgsm/ahlserver/_default.cfg index b9d5e36b51..35f4d6d019 100644 --- a/lgsm/config-default/config-lgsm/ahlserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ahlserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/arkserver/_default.cfg b/lgsm/config-default/config-lgsm/arkserver/_default.cfg index 8aace75192..61c2d456da 100644 --- a/lgsm/config-default/config-lgsm/arkserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/arkserver/_default.cfg @@ -39,7 +39,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/arma3server/_default.cfg b/lgsm/config-default/config-lgsm/arma3server/_default.cfg index b8e8b3db7d..0a4f1fbf4a 100644 --- a/lgsm/config-default/config-lgsm/arma3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/arma3server/_default.cfg @@ -53,7 +53,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/bb2server/_default.cfg b/lgsm/config-default/config-lgsm/bb2server/_default.cfg index 044dd18a38..976423a1e4 100644 --- a/lgsm/config-default/config-lgsm/bb2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/bb2server/_default.cfg @@ -43,7 +43,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/bbserver/_default.cfg b/lgsm/config-default/config-lgsm/bbserver/_default.cfg index a263486d4b..64dc10d114 100644 --- a/lgsm/config-default/config-lgsm/bbserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bbserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/bdserver/_default.cfg b/lgsm/config-default/config-lgsm/bdserver/_default.cfg index a57e41c12a..daaba9f6be 100644 --- a/lgsm/config-default/config-lgsm/bdserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bdserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/bf1942server/_default.cfg b/lgsm/config-default/config-lgsm/bf1942server/_default.cfg index cd77130db4..69974740e2 100644 --- a/lgsm/config-default/config-lgsm/bf1942server/_default.cfg +++ b/lgsm/config-default/config-lgsm/bf1942server/_default.cfg @@ -30,7 +30,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg b/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg index 5b947486b7..45dce52257 100644 --- a/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg @@ -43,7 +43,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/boserver/_default.cfg b/lgsm/config-default/config-lgsm/boserver/_default.cfg index da2b4163a3..3a3f3e5d5c 100644 --- a/lgsm/config-default/config-lgsm/boserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/boserver/_default.cfg @@ -36,7 +36,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/bsserver/_default.cfg b/lgsm/config-default/config-lgsm/bsserver/_default.cfg index 6685734d9d..9ff4abdb81 100644 --- a/lgsm/config-default/config-lgsm/bsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bsserver/_default.cfg @@ -47,7 +47,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/bt1944server/_default.cfg b/lgsm/config-default/config-lgsm/bt1944server/_default.cfg index 3565e3670e..22e0f1c3de 100644 --- a/lgsm/config-default/config-lgsm/bt1944server/_default.cfg +++ b/lgsm/config-default/config-lgsm/bt1944server/_default.cfg @@ -35,7 +35,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/btserver/_default.cfg b/lgsm/config-default/config-lgsm/btserver/_default.cfg index 7825610a9c..97b4db1c24 100644 --- a/lgsm/config-default/config-lgsm/btserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/btserver/_default.cfg @@ -30,7 +30,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/ccserver/_default.cfg b/lgsm/config-default/config-lgsm/ccserver/_default.cfg index e6feab660f..2f1b118181 100644 --- a/lgsm/config-default/config-lgsm/ccserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ccserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/cod2server/_default.cfg b/lgsm/config-default/config-lgsm/cod2server/_default.cfg index 61e2962c33..18e0b86785 100644 --- a/lgsm/config-default/config-lgsm/cod2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/cod2server/_default.cfg @@ -36,7 +36,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/cod4server/_default.cfg b/lgsm/config-default/config-lgsm/cod4server/_default.cfg index ebf573ac3d..b2efc329c7 100644 --- a/lgsm/config-default/config-lgsm/cod4server/_default.cfg +++ b/lgsm/config-default/config-lgsm/cod4server/_default.cfg @@ -36,7 +36,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/codserver/_default.cfg b/lgsm/config-default/config-lgsm/codserver/_default.cfg index bd783d62ce..e50e6184ba 100644 --- a/lgsm/config-default/config-lgsm/codserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/codserver/_default.cfg @@ -36,7 +36,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/coduoserver/_default.cfg b/lgsm/config-default/config-lgsm/coduoserver/_default.cfg index a187cfc992..7397f85041 100644 --- a/lgsm/config-default/config-lgsm/coduoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/coduoserver/_default.cfg @@ -36,7 +36,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg index ba91632053..a77fd2dd38 100644 --- a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg @@ -36,7 +36,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/csczserver/_default.cfg b/lgsm/config-default/config-lgsm/csczserver/_default.cfg index 918d78841e..4c56cb6e16 100644 --- a/lgsm/config-default/config-lgsm/csczserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/csczserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg index 15f45808bc..f4e242e993 100644 --- a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg @@ -63,7 +63,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/csserver/_default.cfg b/lgsm/config-default/config-lgsm/csserver/_default.cfg index 1c58f02569..bc27a535cc 100644 --- a/lgsm/config-default/config-lgsm/csserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/csserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/cssserver/_default.cfg b/lgsm/config-default/config-lgsm/cssserver/_default.cfg index d50676ced0..5388b61237 100644 --- a/lgsm/config-default/config-lgsm/cssserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/cssserver/_default.cfg @@ -43,7 +43,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/dabserver/_default.cfg b/lgsm/config-default/config-lgsm/dabserver/_default.cfg index 03d518e062..c9347d8d41 100644 --- a/lgsm/config-default/config-lgsm/dabserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dabserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/dmcserver/_default.cfg b/lgsm/config-default/config-lgsm/dmcserver/_default.cfg index d2dcee9fa5..7a11d77a89 100644 --- a/lgsm/config-default/config-lgsm/dmcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dmcserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/dodserver/_default.cfg b/lgsm/config-default/config-lgsm/dodserver/_default.cfg index f23ab09b87..50ea789b19 100644 --- a/lgsm/config-default/config-lgsm/dodserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dodserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/dodsserver/_default.cfg b/lgsm/config-default/config-lgsm/dodsserver/_default.cfg index 4e1aa6c944..b967ef72d4 100644 --- a/lgsm/config-default/config-lgsm/dodsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dodsserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/doiserver/_default.cfg b/lgsm/config-default/config-lgsm/doiserver/_default.cfg index 958e088f22..eebbdf699c 100644 --- a/lgsm/config-default/config-lgsm/doiserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/doiserver/_default.cfg @@ -39,7 +39,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/dstserver/_default.cfg b/lgsm/config-default/config-lgsm/dstserver/_default.cfg index 3073f2d797..a7025a9667 100644 --- a/lgsm/config-default/config-lgsm/dstserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dstserver/_default.cfg @@ -41,7 +41,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/dysserver/_default.cfg b/lgsm/config-default/config-lgsm/dysserver/_default.cfg index f368fc3101..501fe475ea 100644 --- a/lgsm/config-default/config-lgsm/dysserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dysserver/_default.cfg @@ -43,7 +43,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg index c68e15df27..fe53ee5f8f 100644 --- a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg @@ -30,7 +30,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/emserver/_default.cfg b/lgsm/config-default/config-lgsm/emserver/_default.cfg index 65fe4d0dc8..75445659c2 100644 --- a/lgsm/config-default/config-lgsm/emserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/emserver/_default.cfg @@ -43,7 +43,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/etlserver/_default.cfg b/lgsm/config-default/config-lgsm/etlserver/_default.cfg index ed4759cd23..7813caa17e 100644 --- a/lgsm/config-default/config-lgsm/etlserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/etlserver/_default.cfg @@ -30,7 +30,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/fctrserver/_default.cfg b/lgsm/config-default/config-lgsm/fctrserver/_default.cfg index 15c5bf0cf8..c071e01f3e 100644 --- a/lgsm/config-default/config-lgsm/fctrserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/fctrserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/fofserver/_default.cfg b/lgsm/config-default/config-lgsm/fofserver/_default.cfg index b2da0ed5b8..5c1e44af62 100644 --- a/lgsm/config-default/config-lgsm/fofserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/fofserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/gesserver/_default.cfg b/lgsm/config-default/config-lgsm/gesserver/_default.cfg index 00ba0497f1..a88fe3cffd 100644 --- a/lgsm/config-default/config-lgsm/gesserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/gesserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg index d1501dc711..b12b1e5519 100644 --- a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg @@ -54,7 +54,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg b/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg index add451f923..4ff3998a1a 100644 --- a/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/hldmserver/_default.cfg b/lgsm/config-default/config-lgsm/hldmserver/_default.cfg index 279f13b731..de4ab821d8 100644 --- a/lgsm/config-default/config-lgsm/hldmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hldmserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg b/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg index 787e3c32b9..c733317055 100644 --- a/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/hwserver/_default.cfg b/lgsm/config-default/config-lgsm/hwserver/_default.cfg index facdaea0e6..c934622fb5 100644 --- a/lgsm/config-default/config-lgsm/hwserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hwserver/_default.cfg @@ -49,7 +49,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/insserver/_default.cfg b/lgsm/config-default/config-lgsm/insserver/_default.cfg index a9daf4e867..d595be7ffe 100644 --- a/lgsm/config-default/config-lgsm/insserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/insserver/_default.cfg @@ -44,7 +44,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/inssserver/_default.cfg b/lgsm/config-default/config-lgsm/inssserver/_default.cfg index 014333b6ae..cd66169d6a 100644 --- a/lgsm/config-default/config-lgsm/inssserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/inssserver/_default.cfg @@ -45,7 +45,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/iosserver/_default.cfg b/lgsm/config-default/config-lgsm/iosserver/_default.cfg index 27f93c29c1..7e63ed0f24 100644 --- a/lgsm/config-default/config-lgsm/iosserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/iosserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/jc2server/_default.cfg b/lgsm/config-default/config-lgsm/jc2server/_default.cfg index 2942b0b6c5..deccd031de 100644 --- a/lgsm/config-default/config-lgsm/jc2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/jc2server/_default.cfg @@ -30,7 +30,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/jc3server/_default.cfg b/lgsm/config-default/config-lgsm/jc3server/_default.cfg index 1c88c7de22..44d668ddac 100644 --- a/lgsm/config-default/config-lgsm/jc3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/jc3server/_default.cfg @@ -30,7 +30,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/kf2server/_default.cfg b/lgsm/config-default/config-lgsm/kf2server/_default.cfg index 016c28f693..6e31023beb 100644 --- a/lgsm/config-default/config-lgsm/kf2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/kf2server/_default.cfg @@ -36,7 +36,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/kfserver/_default.cfg b/lgsm/config-default/config-lgsm/kfserver/_default.cfg index ee58179098..ec86c53697 100644 --- a/lgsm/config-default/config-lgsm/kfserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/kfserver/_default.cfg @@ -42,7 +42,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/l4d2server/_default.cfg b/lgsm/config-default/config-lgsm/l4d2server/_default.cfg index 90c597f9e0..ca29ca183b 100644 --- a/lgsm/config-default/config-lgsm/l4d2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/l4d2server/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/l4dserver/_default.cfg b/lgsm/config-default/config-lgsm/l4dserver/_default.cfg index c72d16e142..2181c81f17 100644 --- a/lgsm/config-default/config-lgsm/l4dserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/l4dserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/mcbserver/_default.cfg b/lgsm/config-default/config-lgsm/mcbserver/_default.cfg index 79a623d610..26d25edf35 100644 --- a/lgsm/config-default/config-lgsm/mcbserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mcbserver/_default.cfg @@ -30,7 +30,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/mcserver/_default.cfg b/lgsm/config-default/config-lgsm/mcserver/_default.cfg index 904a2af88b..efa103c676 100644 --- a/lgsm/config-default/config-lgsm/mcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mcserver/_default.cfg @@ -33,7 +33,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/mhserver/_default.cfg b/lgsm/config-default/config-lgsm/mhserver/_default.cfg index cc4de62768..dc80cc3187 100644 --- a/lgsm/config-default/config-lgsm/mhserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mhserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/mohaaserver/_default.cfg b/lgsm/config-default/config-lgsm/mohaaserver/_default.cfg index 97fe12dc82..ad386e2805 100644 --- a/lgsm/config-default/config-lgsm/mohaaserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mohaaserver/_default.cfg @@ -35,7 +35,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/mtaserver/_default.cfg b/lgsm/config-default/config-lgsm/mtaserver/_default.cfg index bb1e477621..03f6f43212 100644 --- a/lgsm/config-default/config-lgsm/mtaserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mtaserver/_default.cfg @@ -34,7 +34,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg b/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg index b722193b29..fffde2f51c 100644 --- a/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg @@ -31,7 +31,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/ndserver/_default.cfg b/lgsm/config-default/config-lgsm/ndserver/_default.cfg index ab269aaf6d..d37f44f1f4 100644 --- a/lgsm/config-default/config-lgsm/ndserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ndserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg b/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg index 4c56f8a8d1..a2aac7eb30 100644 --- a/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg @@ -43,7 +43,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg index f984d1908e..9dbb285929 100644 --- a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg @@ -45,7 +45,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/ns2server/_default.cfg b/lgsm/config-default/config-lgsm/ns2server/_default.cfg index fbf3122223..9b042130fd 100644 --- a/lgsm/config-default/config-lgsm/ns2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ns2server/_default.cfg @@ -49,7 +49,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/nsserver/_default.cfg b/lgsm/config-default/config-lgsm/nsserver/_default.cfg index 6654d2e82b..ad85b88c6d 100644 --- a/lgsm/config-default/config-lgsm/nsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/nsserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/opforserver/_default.cfg b/lgsm/config-default/config-lgsm/opforserver/_default.cfg index 5f50583fb4..b5c9a30e56 100644 --- a/lgsm/config-default/config-lgsm/opforserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/opforserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/pcserver/_default.cfg b/lgsm/config-default/config-lgsm/pcserver/_default.cfg index a4f7a8942b..d9c65db4d1 100644 --- a/lgsm/config-default/config-lgsm/pcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pcserver/_default.cfg @@ -30,7 +30,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index 09e357bef7..c8ea594e73 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -39,7 +39,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg b/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg index 4d6244afd1..a38ba25cdb 100644 --- a/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/pzserver/_default.cfg b/lgsm/config-default/config-lgsm/pzserver/_default.cfg index 62862f21f8..9373f9a0f4 100644 --- a/lgsm/config-default/config-lgsm/pzserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pzserver/_default.cfg @@ -33,7 +33,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/q2server/_default.cfg b/lgsm/config-default/config-lgsm/q2server/_default.cfg index 8601a5f8d0..7d28a1cbe4 100644 --- a/lgsm/config-default/config-lgsm/q2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/q2server/_default.cfg @@ -35,7 +35,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/q3server/_default.cfg b/lgsm/config-default/config-lgsm/q3server/_default.cfg index 02d27c9d84..b9b9f6b81c 100644 --- a/lgsm/config-default/config-lgsm/q3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/q3server/_default.cfg @@ -35,7 +35,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/qlserver/_default.cfg b/lgsm/config-default/config-lgsm/qlserver/_default.cfg index 71f86ac982..2e35972617 100644 --- a/lgsm/config-default/config-lgsm/qlserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/qlserver/_default.cfg @@ -32,7 +32,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/qwserver/_default.cfg b/lgsm/config-default/config-lgsm/qwserver/_default.cfg index 693ffcbdfc..ee1d88eef4 100644 --- a/lgsm/config-default/config-lgsm/qwserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/qwserver/_default.cfg @@ -34,7 +34,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg b/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg index f62f4ceb18..0117dbd61e 100644 --- a/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/roserver/_default.cfg b/lgsm/config-default/config-lgsm/roserver/_default.cfg index 1018f0028a..ac2e2d8450 100644 --- a/lgsm/config-default/config-lgsm/roserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/roserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/rtcwserver/_default.cfg b/lgsm/config-default/config-lgsm/rtcwserver/_default.cfg index 1abd2e20df..c54f983697 100644 --- a/lgsm/config-default/config-lgsm/rtcwserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/rtcwserver/_default.cfg @@ -35,7 +35,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/rustserver/_default.cfg b/lgsm/config-default/config-lgsm/rustserver/_default.cfg index 6835d35d67..05d97a267d 100644 --- a/lgsm/config-default/config-lgsm/rustserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/rustserver/_default.cfg @@ -62,7 +62,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/rwserver/_default.cfg b/lgsm/config-default/config-lgsm/rwserver/_default.cfg index 966c473fca..89aea7cb22 100644 --- a/lgsm/config-default/config-lgsm/rwserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/rwserver/_default.cfg @@ -33,7 +33,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/sampserver/_default.cfg b/lgsm/config-default/config-lgsm/sampserver/_default.cfg index 50b52ad562..fe7ac91117 100644 --- a/lgsm/config-default/config-lgsm/sampserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sampserver/_default.cfg @@ -34,7 +34,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg index e5d21ae7eb..34c05d6099 100644 --- a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/sbserver/_default.cfg b/lgsm/config-default/config-lgsm/sbserver/_default.cfg index cdff1963d9..4cb4a00aa8 100644 --- a/lgsm/config-default/config-lgsm/sbserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg b/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg index 4355298bb5..d6cc4a1094 100644 --- a/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg @@ -33,7 +33,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/sfcserver/_default.cfg b/lgsm/config-default/config-lgsm/sfcserver/_default.cfg index 373678cb4a..04743cab27 100644 --- a/lgsm/config-default/config-lgsm/sfcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sfcserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/sof2server/_default.cfg b/lgsm/config-default/config-lgsm/sof2server/_default.cfg index 48887e1ce5..36ef2b89b3 100644 --- a/lgsm/config-default/config-lgsm/sof2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/sof2server/_default.cfg @@ -35,7 +35,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/solserver/_default.cfg b/lgsm/config-default/config-lgsm/solserver/_default.cfg index 89fe8c4e1f..1cf1f3491f 100644 --- a/lgsm/config-default/config-lgsm/solserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/solserver/_default.cfg @@ -36,7 +36,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/squadserver/_default.cfg b/lgsm/config-default/config-lgsm/squadserver/_default.cfg index ab8551bcb8..633025284c 100644 --- a/lgsm/config-default/config-lgsm/squadserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/squadserver/_default.cfg @@ -35,7 +35,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/ss3server/_default.cfg b/lgsm/config-default/config-lgsm/ss3server/_default.cfg index 606fdb21c4..349cd66735 100644 --- a/lgsm/config-default/config-lgsm/ss3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ss3server/_default.cfg @@ -34,7 +34,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/stserver/_default.cfg b/lgsm/config-default/config-lgsm/stserver/_default.cfg index 73883f7851..4f16563753 100644 --- a/lgsm/config-default/config-lgsm/stserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/stserver/_default.cfg @@ -40,7 +40,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/svenserver/_default.cfg b/lgsm/config-default/config-lgsm/svenserver/_default.cfg index 208adad838..bf35e6a209 100644 --- a/lgsm/config-default/config-lgsm/svenserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/svenserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg b/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg index 495eaf159e..54956236cf 100644 --- a/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/tf2server/_default.cfg b/lgsm/config-default/config-lgsm/tf2server/_default.cfg index bcc4585b4a..741f30a753 100644 --- a/lgsm/config-default/config-lgsm/tf2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/tf2server/_default.cfg @@ -43,7 +43,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/tfcserver/_default.cfg b/lgsm/config-default/config-lgsm/tfcserver/_default.cfg index 0223c28c47..3a0d22ea52 100644 --- a/lgsm/config-default/config-lgsm/tfcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/tfcserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/ts3server/_default.cfg b/lgsm/config-default/config-lgsm/ts3server/_default.cfg index 2d53a07258..7a721ec013 100644 --- a/lgsm/config-default/config-lgsm/ts3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ts3server/_default.cfg @@ -33,7 +33,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/tsserver/_default.cfg b/lgsm/config-default/config-lgsm/tsserver/_default.cfg index be66db8971..c454e1f150 100644 --- a/lgsm/config-default/config-lgsm/tsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/tsserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/tuserver/_default.cfg b/lgsm/config-default/config-lgsm/tuserver/_default.cfg index 2c0b3b445b..acc711d2c4 100644 --- a/lgsm/config-default/config-lgsm/tuserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/tuserver/_default.cfg @@ -40,7 +40,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/twserver/_default.cfg b/lgsm/config-default/config-lgsm/twserver/_default.cfg index f9ca0f9962..e10305a942 100644 --- a/lgsm/config-default/config-lgsm/twserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/twserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/untserver/_default.cfg b/lgsm/config-default/config-lgsm/untserver/_default.cfg index e50f032c4a..1b91ba923f 100644 --- a/lgsm/config-default/config-lgsm/untserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/untserver/_default.cfg @@ -40,7 +40,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg b/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg index 2658f60ca3..74f026ea5e 100644 --- a/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg @@ -34,7 +34,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/ut3server/_default.cfg b/lgsm/config-default/config-lgsm/ut3server/_default.cfg index 6c1db9e1ef..16998ea6c1 100644 --- a/lgsm/config-default/config-lgsm/ut3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut3server/_default.cfg @@ -45,7 +45,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/ut99server/_default.cfg b/lgsm/config-default/config-lgsm/ut99server/_default.cfg index d8d80345d8..dad542598e 100644 --- a/lgsm/config-default/config-lgsm/ut99server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut99server/_default.cfg @@ -34,7 +34,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/utserver/_default.cfg b/lgsm/config-default/config-lgsm/utserver/_default.cfg index 5227e99bf2..b12457c440 100644 --- a/lgsm/config-default/config-lgsm/utserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/utserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/vsserver/_default.cfg b/lgsm/config-default/config-lgsm/vsserver/_default.cfg index f1f8f7c4d1..6da0d9fb13 100644 --- a/lgsm/config-default/config-lgsm/vsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/vsserver/_default.cfg @@ -37,7 +37,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/wetserver/_default.cfg b/lgsm/config-default/config-lgsm/wetserver/_default.cfg index 3df5c91dc1..6cce7a75a1 100644 --- a/lgsm/config-default/config-lgsm/wetserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/wetserver/_default.cfg @@ -30,7 +30,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/wfserver/_default.cfg b/lgsm/config-default/config-lgsm/wfserver/_default.cfg index dacb39aaf9..b40fcda6dc 100644 --- a/lgsm/config-default/config-lgsm/wfserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/wfserver/_default.cfg @@ -35,7 +35,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/wurmserver/_default.cfg b/lgsm/config-default/config-lgsm/wurmserver/_default.cfg index 08a17c81be..a532aa93a1 100644 --- a/lgsm/config-default/config-lgsm/wurmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/wurmserver/_default.cfg @@ -32,7 +32,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/zmrserver/_default.cfg b/lgsm/config-default/config-lgsm/zmrserver/_default.cfg index 7de855e46b..7e1c621b0f 100644 --- a/lgsm/config-default/config-lgsm/zmrserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/zmrserver/_default.cfg @@ -38,7 +38,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/config-default/config-lgsm/zpsserver/_default.cfg b/lgsm/config-default/config-lgsm/zpsserver/_default.cfg index 5f8d76c23b..8d55e4d44d 100644 --- a/lgsm/config-default/config-lgsm/zpsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/zpsserver/_default.cfg @@ -43,7 +43,7 @@ displayip="" # More info | https://docs.linuxgsm.com/alerts#more-info postalert="off" postdays="7" -posttarget="https://hastebin.com" +posttarget="https://termbin.com" # Discord Alerts | https://docs.linuxgsm.com/alerts/discord discordalert="off" diff --git a/lgsm/functions/command_postdetails.sh b/lgsm/functions/command_postdetails.sh index 0657a26227..083bc72133 100644 --- a/lgsm/functions/command_postdetails.sh +++ b/lgsm/functions/command_postdetails.sh @@ -27,7 +27,7 @@ local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")") # to post to pastebin, or # rustserver@gamerig:~$ posttarget= ./rustserver pd # to leave the output on the filesystem. -posttarget=${posttarget="https://hastebin.com"} +posttarget=${posttarget="https://termbin.com"} # For pastebin, you can set the expiration period. # use 1 week as the default, other options are '24h' for a day, etc. From 736e55717f9a789aae783ddf5c74bba5d19ab9bc Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 16 Feb 2020 01:01:23 +0000 Subject: [PATCH 06/17] standardise command if --- lgsm/functions/check_deps.sh | 36 +++++++++++----------- lgsm/functions/command_dev_detect_deps.sh | 4 +-- lgsm/functions/command_dev_detect_glibc.sh | 2 +- lgsm/functions/command_fastdl.sh | 2 +- lgsm/functions/command_monitor.sh | 2 +- lgsm/functions/command_stop.sh | 2 +- lgsm/functions/command_validate.sh | 2 +- lgsm/functions/core_dl.sh | 2 +- lgsm/functions/info_distro.sh | 10 +++--- lgsm/functions/info_stats.sh | 2 +- lgsm/functions/install_server_files.sh | 2 +- lgsm/functions/query_gamedig.sh | 2 +- lgsm/functions/update_steamcmd.sh | 2 +- linuxgsm.sh | 4 +-- tests/tests_fctrserver.sh | 4 +-- tests/tests_jc2server.sh | 2 +- tests/tests_mcserver.sh | 4 +-- tests/tests_ts3server.sh | 4 +-- 18 files changed, 44 insertions(+), 44 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 5362e73b54..c88f2870ca 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -160,7 +160,7 @@ fn_deps_detector(){ depstatus=1 jquniversemissing=1 elif [ "${deptocheck}" == "mono-complete" ]; then - if [ -n "$(command -v mono 2>/dev/null)" ]&&[ "$(mono --version 2>&1 | grep -Po '(?<=version )\d')" -ge 5 ]; then + if [ "$(command -v mono 2>/dev/null)" ]&&[ "$(mono --version 2>&1 | grep -Po '(?<=version )\d')" -ge 5 ]; then # Mono >= 5.0.0 already installed. depstatus=0 else @@ -168,10 +168,10 @@ fn_deps_detector(){ depstatus=1 monostatus=1 fi - elif [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then + elif [ "$(command -v dpkg-query 2>/dev/null)" ]; then dpkg-query -W -f='${Status}' "${deptocheck}" 2>/dev/null | grep -q -P '^install ok installed' depstatus=$? - elif [ -n "$(command -v rpm 2>/dev/null)" ]; then + elif [ "$(command -v rpm 2>/dev/null)" ]; then rpm -q "${deptocheck}" > /dev/null 2>&1 depstatus=$? fi @@ -212,15 +212,15 @@ fn_deps_email(){ array_deps_required+=( exim4 ) elif [ -d /etc/sendmail ]; then array_deps_required+=( sendmail ) - elif [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then + elif [ "$(command -v dpkg-query 2>/dev/null)" ]; then array_deps_required+=( mailutils postfix ) - elif [ -n "$(command -v rpm 2>/dev/null)" ]; then + elif [ "$(command -v rpm 2>/dev/null)" ]; then array_deps_required+=( mailx postfix ) fi else - if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then + if [ "$(command -v dpkg-query 2>/dev/null)" ]; then array_deps_required+=( mailutils postfix ) - elif [ -n "$(command -v rpm 2>/dev/null)" ]; then + elif [ "$(command -v rpm 2>/dev/null)" ]; then array_deps_required+=( mailx postfix ) fi fi @@ -255,13 +255,13 @@ fn_found_missing_deps(){ echo -en "...\r" sleep 1 echo -en " \r" - if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then + if [ "$(command -v dpkg-query 2>/dev/null)" ]; then cmd="sudo dpkg --add-architecture i386; sudo apt update; sudo apt -y install ${array_deps_missing[@]}" eval "${cmd}" - elif [ -n "$(command -v dnf 2>/dev/null)" ]; then + elif [ "$(command -v dnf 2>/dev/null)" ]; then cmd="sudo dnf -y install ${array_deps_missing[@]}" eval "${cmd}" - elif [ -n "$(command -v yum 2>/dev/null)" ]; then + elif [ "$(command -v yum 2>/dev/null)" ]; then cmd="sudo yum -y install ${array_deps_missing[@]}" eval "${cmd}" fi @@ -271,11 +271,11 @@ fn_found_missing_deps(){ echo -e "" fn_print_warning_nl "Manually install dependencies." fn_script_log_warn "Manually install dependencies." - if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then + if [ "$(command -v dpkg-query 2>/dev/null)" ]; then echo -e " sudo dpkg --add-architecture i386; sudo apt update; sudo apt install ${array_deps_missing[@]}" - elif [ -n "$(command -v dnf 2>/dev/null)" ]; then + elif [ "$(command -v dnf 2>/dev/null)" ]; then echo -e " sudo dnf install ${array_deps_missing[@]}" - elif [ -n "$(command -v yum 2>/dev/null)" ]; then + elif [ "$(command -v yum 2>/dev/null)" ]; then echo -e " sudo yum install ${array_deps_missing[@]}" fi if [ "${steamcmdfail}" ]; then @@ -292,11 +292,11 @@ fn_found_missing_deps(){ echo -e "" fn_print_warning_nl "$(whoami) does not have sudo access. Manually install dependencies." fn_script_log_warn "$(whoami) does not have sudo access. Manually install dependencies." - if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then + if [ "$(command -v dpkg-query 2>/dev/null)" ]; then echo -e " sudo dpkg --add-architecture i386; sudo apt update; sudo apt install ${array_deps_missing[@]}" - elif [ -n "$(command -v dnf 2>/dev/null)" ]; then + elif [ "$(command -v dnf 2>/dev/null)" ]; then echo -e " sudo dnf install ${array_deps_missing[@]}" - elif [ -n "$(command -v yum 2>/dev/null)" ]; then + elif [ "$(command -v yum 2>/dev/null)" ]; then echo -e " sudo yum install ${array_deps_missing[@]}" fi if [ "${steamcmdfail}" ]; then @@ -337,7 +337,7 @@ fn_deps_build_debian(){ # LinuxGSM requirements. array_deps_required=( curl wget ca-certificates file bsdmainutils util-linux python3 tar bzip2 gzip unzip binutils bc jq ) - if [ -n "$(command -v tmux 2>/dev/null)" ]; then + if [ "$(command -v tmux 2>/dev/null)" ]; then tmuxcheck=1 # Added for users compiling tmux from source to bypass check. else array_deps_required+=( tmux ) @@ -461,7 +461,7 @@ fn_deps_build_redhat(){ fi # All servers except ts3 require tmux. - if [ -n "$(command -v tmux 2>/dev/null)" ]; then + if [ "$(command -v tmux 2>/dev/null)" ]; then # Added for users compiling tmux from source to bypass check. tmuxcheck=1 else diff --git a/lgsm/functions/command_dev_detect_deps.sh b/lgsm/functions/command_dev_detect_deps.sh index 252b37022b..50b9078c8d 100644 --- a/lgsm/functions/command_dev_detect_deps.sh +++ b/lgsm/functions/command_dev_detect_deps.sh @@ -13,9 +13,9 @@ echo -e "Dependencies Checker" echo -e "=================================" echo -e "Checking directory: " echo -e "${serverfiles}" -if [ -n "$(command -v eu-readelf 2>/dev/null)" ]; then +if [ "$(command -v eu-readelf 2>/dev/null)" ]; then readelf=eu-readelf -elif [ -n "$(command -v readelf 2>/dev/null)" ]; then +elif [ "$(command -v readelf 2>/dev/null)" ]; then readelf=readelf else echo -e "readelf/eu-readelf not installed" diff --git a/lgsm/functions/command_dev_detect_glibc.sh b/lgsm/functions/command_dev_detect_glibc.sh index e86fb05db0..c5c624ed23 100644 --- a/lgsm/functions/command_dev_detect_glibc.sh +++ b/lgsm/functions/command_dev_detect_glibc.sh @@ -13,7 +13,7 @@ echo -e "=================================" echo -e "glibc Requirements Checker" echo -e "=================================" -if [ -z "$(command -v objdump)" ]; then +if [ ! "$(command -v objdump)" ]; then fn_print_failure_nl "objdump is missing" fn_script_log_fatal "objdump is missing" core_exit.sh diff --git a/lgsm/functions/command_fastdl.sh b/lgsm/functions/command_fastdl.sh index d862c7ed85..de74f62f84 100644 --- a/lgsm/functions/command_fastdl.sh +++ b/lgsm/functions/command_fastdl.sh @@ -23,7 +23,7 @@ luafastdlfile="lgsm_cl_force_fastdl.lua" luafastdlfullpath="${luasvautorundir}/${luafastdlfile}" # Check if bzip2 is installed. -if [ -z "$(command -v bzip2 2>/dev/null)" ]; then +if [ ! "$(command -v bzip2 2>/dev/null)" ]; then fn_print_fail "bzip2 is not installed" fn_script_log_fatal "bzip2 is not installed" core_exit.sh diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh index 363189098f..0dada94640 100644 --- a/lgsm/functions/command_monitor.sh +++ b/lgsm/functions/command_monitor.sh @@ -211,7 +211,7 @@ fn_monitor_loop(){ do # Will check if gamedig is installed and bypass if not. if [ "${querymethod}" == "gamedig" ]; then - if [ -n "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ]; then + if [ "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ]; then if [ -z "${monitorpass}" ]; then fn_monitor_query fi diff --git a/lgsm/functions/command_stop.sh b/lgsm/functions/command_stop.sh index f166fa552a..03a3bff183 100644 --- a/lgsm/functions/command_stop.sh +++ b/lgsm/functions/command_stop.sh @@ -126,7 +126,7 @@ fn_stop_graceful_sdtd(){ fn_script_log_info "Graceful: telnet" if [ "${telnetenabled}" == "false" ]; then fn_print_info_nl "Graceful: telnet: DISABLED: Enable in ${servercfg}" - elif [ -n "$(command -v expect 2>/dev/null)" ]; then + elif [ "$(command -v expect 2>/dev/null)" ]; then # Tries to shutdown with both localhost and server IP. for telnetip in 127.0.0.1 ${ip}; do fn_print_dots "Graceful: telnet: ${telnetip}:${telnetport}" diff --git a/lgsm/functions/command_validate.sh b/lgsm/functions/command_validate.sh index 83d9f119bc..8ce12b2067 100644 --- a/lgsm/functions/command_validate.sh +++ b/lgsm/functions/command_validate.sh @@ -18,7 +18,7 @@ fn_validation(){ cd "${steamcmddir}" || exit # Detects if unbuffer command is available for 32 bit distributions only. info_distro.sh - if [ -n "$(command -v stdbuf)" ]&&[ "${arch}" != "x86_64" ]; then + if [ "$(command -v stdbuf)" ]&&[ "${arch}" != "x86_64" ]; then unbuffer="stdbuf -i0 -o0 -e0" fi diff --git a/lgsm/functions/core_dl.sh b/lgsm/functions/core_dl.sh index 24cff68bf7..e4114209f9 100644 --- a/lgsm/functions/core_dl.sh +++ b/lgsm/functions/core_dl.sh @@ -256,7 +256,7 @@ fn_update_function(){ } # Check that curl is installed -if [ -z "$(command -v curl 2>/dev/null)" ]; then +if [ ! "$(command -v curl 2>/dev/null)" ]; then echo -e "[ FAIL ] Curl is not installed" exit 1 fi diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 38305c6e38..9abb31b974 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -32,7 +32,7 @@ do distroversion=$(grep VERSION_ID /etc/os-release | sed 's/VERSION_ID=//g' | sed 's/\"//g') distroid=$(grep ID /etc/os-release | grep -v _ID | grep -v ID_ | sed 's/ID=//g' | sed 's/\"//g') distrocodename=$(grep VERSION_CODENAME /etc/os-release | sed 's/VERSION_CODENAME=//g' | sed 's/\"//g') - elif [ -n "$(command -v lsb_release 2>/dev/null)" ]&&[ "${distro_info}" == "lsb_release" ]; then + elif [ "$(command -v lsb_release 2>/dev/null)" ]&&[ "${distro_info}" == "lsb_release" ]; then if [ -z "${distroname}" ];then distroname=$(lsb_release -sd) elif [ -z "${distroversion}" ];then @@ -42,7 +42,7 @@ do elif [ -z "${distrocodename}" ];then distrocodename=$(lsb_release -sc) fi - elif [ -n "$(command -v hostnamectl 2>/dev/null)" ]&&[ "${distro_info}" == "hostnamectl" ]; then + elif [ "$(command -v hostnamectl 2>/dev/null)" ]&&[ "${distro_info}" == "hostnamectl" ]; then if [ -z "${distroname}" ];then distroname=$(hostnamectl | grep "Operating System" | sed 's/Operating System: //g') fi @@ -71,7 +71,7 @@ glibcversion=$(ldd --version | sed -n '1s/.* //p') ## tmux version # e.g: tmux 1.6 -if [ -z "$(command -V tmux 2>/dev/null)" ]; then +if [ ! "$(command -V tmux 2>/dev/null)" ]; then tmuxv="${red}NOT INSTALLED!${default}" else if [ "$(tmux -V | sed "s/tmux //" | sed -n '1 p' | tr -cd '[:digit:]')" -lt "16" ]; then @@ -107,7 +107,7 @@ fi # Available RAM and swap. # Newer distros can use numfmt to give more accurate results. -if [ -n "$(command -v numfmt 2>/dev/null)" ]; then +if [ "$(command -v numfmt 2>/dev/null)" ]; then # Issue #2005 - Kernel 3.14+ contains MemAvailable which should be used. All others will be calculated. # get the raw KB values of these fields. @@ -252,7 +252,7 @@ else fi # Steam Master Server - checks if detected by master server. -if [ -n "$(command -v jq 2>/dev/null)" ]; then +if [ "$(command -v jq 2>/dev/null)" ]; then if [ "${ip}" ]&&[ "${port}" ]; then if [ "${steammaster}" == "true" ]; then masterserver=$(curl -m 3 -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${ip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l) diff --git a/lgsm/functions/info_stats.sh b/lgsm/functions/info_stats.sh index f31db13d7d..ef0788fad8 100644 --- a/lgsm/functions/info_stats.sh +++ b/lgsm/functions/info_stats.sh @@ -10,7 +10,7 @@ info_distro.sh if [ ! -f "${datadir}/uuid.txt" ];then mkdir -p "${datadir}" touch "${datadir}/uuid.txt" - if [ -n "$(command -v uuidgen 2>/dev/null)" ]; then + if [ "$(command -v uuidgen 2>/dev/null)" ]; then uuidgen > "${datadir}/uuid.txt" else cat /proc/sys/kernel/random/uuid > "${datadir}/uuid.txt" diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index b2158b3e78..bb49d09003 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -98,7 +98,7 @@ fn_install_server_files_steamcmd(){ # Detects if unbuffer command is available for 32 bit distributions only. info_distro.sh - if [ -n "$(command -v stdbuf 2>/dev/null)" ]&&[ "${arch}" != "x86_64" ]; then + if [ "$(command -v stdbuf 2>/dev/null)" ]&&[ "${arch}" != "x86_64" ]; then unbuffer="stdbuf -i0 -o0 -e0" fi diff --git a/lgsm/functions/query_gamedig.sh b/lgsm/functions/query_gamedig.sh index 88e01af5f8..4f1bc56383 100644 --- a/lgsm/functions/query_gamedig.sh +++ b/lgsm/functions/query_gamedig.sh @@ -6,7 +6,7 @@ # https://github.com/sonicsnes/node-gamedig # Check if gamedig and jq are installed. -if [ -n "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ]; then +if [ "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ]; then # will bypass query if server offline. check_status.sh diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh index 38b7445de5..07dbdf9e33 100644 --- a/lgsm/functions/update_steamcmd.sh +++ b/lgsm/functions/update_steamcmd.sh @@ -13,7 +13,7 @@ fn_update_steamcmd_dl(){ # Detects if unbuffer command is available for 32 bit distributions only. info_distro.sh - if [ -n "$(command -v stdbuf)" ]&&[ "${arch}" != "x86_64" ]; then + if [ "$(command -v stdbuf)" ]&&[ "${arch}" != "x86_64" ]; then unbuffer="stdbuf -i0 -o0 -e0" fi diff --git a/linuxgsm.sh b/linuxgsm.sh index 1a000656c6..e7afc14b49 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -72,7 +72,7 @@ fn_bootstrap_fetch_file(){ fi # If curl exists download file. - if [ -n "$(command -v curl 2>/dev/null)" ]; then + if [ "$(command -v curl 2>/dev/null)" ]; then # Trap to remove part downloaded files. echo -en " fetching ${local_filename}...\c" curlcmd=$(curl -s --fail -L -o "${local_filedir}/${local_filename}" "${remote_fileurl}" 2>&1) @@ -192,7 +192,7 @@ fn_install_menu() { options=$4 # Get menu command. for menucmd in whiptail dialog bash; do - if [ -x "$(command -v "${menucmd}")" ]; then + if [ "$(command -v "${menucmd}")" ]; then menucmd=$(command -v "${menucmd}") break fi diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh index 97aea9caa0..6561c7ff43 100644 --- a/tests/tests_fctrserver.sh +++ b/tests/tests_fctrserver.sh @@ -81,7 +81,7 @@ fn_bootstrap_fetch_file(){ fi # If curl exists download file. - if [ -n "$(command -v curl 2>/dev/null)" ]; then + if [ "$(command -v curl 2>/dev/null)" ]; then # Trap to remove part downloaded files. echo -en " fetching ${local_filename}...\c" curlcmd=$(curl -s --fail -L -o "${local_filedir}/${local_filename}" "${remote_fileurl}" 2>&1) @@ -201,7 +201,7 @@ fn_install_menu() { options=$4 # Get menu command. for menucmd in whiptail dialog bash; do - if [ -x "$(command -v "${menucmd}")" ]; then + if [ "$(command -v "${menucmd}")" ]; then menucmd=$(command -v "${menucmd}") break fi diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index b80af65542..9478fa6385 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -201,7 +201,7 @@ fn_install_menu() { options=$4 # Get menu command. for menucmd in whiptail dialog bash; do - if [ -x "$(command -v "${menucmd}")" ]; then + if [ "$(command -v "${menucmd}")" ]; then menucmd=$(command -v "${menucmd}") break fi diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh index 304e125eba..8224c5e8c7 100644 --- a/tests/tests_mcserver.sh +++ b/tests/tests_mcserver.sh @@ -81,7 +81,7 @@ fn_bootstrap_fetch_file(){ fi # If curl exists download file. - if [ -n "$(command -v curl 2>/dev/null)" ]; then + if [ "$(command -v curl 2>/dev/null)" ]; then # Trap to remove part downloaded files. echo -en " fetching ${local_filename}...\c" curlcmd=$(curl -s --fail -L -o "${local_filedir}/${local_filename}" "${remote_fileurl}" 2>&1) @@ -201,7 +201,7 @@ fn_install_menu() { options=$4 # Get menu command. for menucmd in whiptail dialog bash; do - if [ -x "$(command -v "${menucmd}")" ]; then + if [ "$(command -v "${menucmd}")" ]; then menucmd=$(command -v "${menucmd}") break fi diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh index f1544c4726..831b1f207b 100644 --- a/tests/tests_ts3server.sh +++ b/tests/tests_ts3server.sh @@ -81,7 +81,7 @@ fn_bootstrap_fetch_file(){ fi # If curl exists download file. - if [ -n "$(command -v curl 2>/dev/null)" ]; then + if [ "$(command -v curl 2>/dev/null)" ]; then # Trap to remove part downloaded files. echo -en " fetching ${local_filename}...\c" curlcmd=$(curl -s --fail -L -o "${local_filedir}/${local_filename}" "${remote_fileurl}" 2>&1) @@ -201,7 +201,7 @@ fn_install_menu() { options=$4 # Get menu command. for menucmd in whiptail dialog bash; do - if [ -x "$(command -v "${menucmd}")" ]; then + if [ "$(command -v "${menucmd}")" ]; then menucmd=$(command -v "${menucmd}") break fi From ef7cdb0d9efe3f692666252524dda041e6092b50 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 16 Feb 2020 23:21:19 +0000 Subject: [PATCH 07/17] feat: debian based distros will now use the steamcmd package --- lgsm/functions/check_deps.sh | 2 +- lgsm/functions/check_steamcmd.sh | 37 ++++++++++++++++++-------- lgsm/functions/command_validate.sh | 8 +++--- lgsm/functions/install_server_files.sh | 14 +++++----- lgsm/functions/update_steamcmd.sh | 15 ++++++----- 5 files changed, 49 insertions(+), 27 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index c88f2870ca..d4ddc8eed2 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -335,7 +335,7 @@ fn_deps_build_debian(){ array_deps_missing=() # LinuxGSM requirements. - array_deps_required=( curl wget ca-certificates file bsdmainutils util-linux python3 tar bzip2 gzip unzip binutils bc jq ) + array_deps_required=( curl wget ca-certificates file bsdmainutils util-linux python3 tar bzip2 gzip unzip binutils bc jq steamcmd ) if [ "$(command -v tmux 2>/dev/null)" ]; then tmuxcheck=1 # Added for users compiling tmux from source to bypass check. diff --git a/lgsm/functions/check_steamcmd.sh b/lgsm/functions/check_steamcmd.sh index 3f6cd90de8..69760f62f7 100644 --- a/lgsm/functions/check_steamcmd.sh +++ b/lgsm/functions/check_steamcmd.sh @@ -7,12 +7,13 @@ local commandname="CHECK" fn_install_steamcmd(){ - if [ ! -d "${steamcmddir}" ]; then - mkdir -pv "${steamcmddir}" + if [ ! -d "${steamcmddir}" ]; then + mkdir -pv "${steamcmddir}" + fi + fn_fetch_file "http://media.steampowered.com/client/steamcmd_linux.tar.gz" "${tmpdir}" "steamcmd_linux.tar.gz" + fn_dl_extract "${tmpdir}" "steamcmd_linux.tar.gz" "${steamcmddir}" + chmod +x "${steamcmddir}/steamcmd.sh" fi - fn_fetch_file "http://media.steampowered.com/client/steamcmd_linux.tar.gz" "${tmpdir}" "steamcmd_linux.tar.gz" - fn_dl_extract "${tmpdir}" "steamcmd_linux.tar.gz" "${steamcmddir}" - chmod +x "${steamcmddir}/steamcmd.sh" } fn_check_steamcmd_user(){ @@ -46,13 +47,19 @@ fn_check_steamcmd_user(){ fn_check_steamcmd_sh(){ # Checks if SteamCMD exists when starting or updating a server. # Installs if missing. - if [ ! -f "${steamcmddir}/steamcmd.sh" ]; then - if [ "${function_selfname}" == "command_install.sh" ]; then - fn_install_steamcmd + if [ ! -f "${steamcmddir}/steamcmd.sh" ]||[ ! "$(command -v steamcmd 2>/dev/null)" ]; then + # Debian and Ubuntu uses steamcmd package + if [ -f "/etc/debian_version" ]&&[ ! "$(command -v steamcmd 2>/dev/null)" ]; then + # Install steamcmd with apt + : else - fn_print_error_nl "SteamCMD is missing" - fn_script_log_error "SteamCMD is missing" - fn_install_steamcmd + if [ "${function_selfname}" == "command_install.sh" ]; then + fn_install_steamcmd + else + fn_print_error_nl "SteamCMD is missing" + fn_script_log_error "SteamCMD is missing" + fn_install_steamcmd + fi fi elif [ "${function_selfname}" == "command_install.sh" ]; then fn_print_information "SteamCMD is already installed..." @@ -60,5 +67,13 @@ fn_check_steamcmd_sh(){ fi } +fn_check_steamcmd_check(){ + if [ "$(command -v steamcmd 2>/dev/null)" ]; then + steamcmdcommand="steamcmd" + else + steamcmdcommand="${steamcmdcommand}" +} + fn_check_steamcmd_user fn_check_steamcmd_sh +fn_check_steamcmd_check diff --git a/lgsm/functions/command_validate.sh b/lgsm/functions/command_validate.sh index 8ce12b2067..93688892ed 100644 --- a/lgsm/functions/command_validate.sh +++ b/lgsm/functions/command_validate.sh @@ -15,7 +15,9 @@ fn_validation(){ echo -e "* https://docs.linuxgsm.com/commands/validate" fn_script_log_info "Validating files: SteamCMD" sleep 3 - cd "${steamcmddir}" || exit + if [ "${steamcmddir}" ]; then + cd "${steamcmddir}" || exit + fi # Detects if unbuffer command is available for 32 bit distributions only. info_distro.sh if [ "$(command -v stdbuf)" ]&&[ "${arch}" != "x86_64" ]; then @@ -23,9 +25,9 @@ fn_validation(){ fi if [ "${appid}" == "90" ]; then - ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_info_print 70 +app_set_config 90 mod "${appidmod}" +app_update "${appid}" "${branch}" +app_update "${appid}" -beta "${branch}" validate +quit | tee -a "${lgsmlog}" + ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_info_print 70 +app_set_config 90 mod "${appidmod}" +app_update "${appid}" "${branch}" +app_update "${appid}" -beta "${branch}" validate +quit | tee -a "${lgsmlog}" else - ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" validate +quit | tee -a "${lgsmlog}" + ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" validate +quit | tee -a "${lgsmlog}" fi if [ $? != 0 ]; then fn_print_fail_nl "Validating files: SteamCMD" diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index bb49d09003..5534679613 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -74,7 +74,9 @@ fn_install_server_files_steamcmd(){ counter="0" while [ "${counter}" == "0" ]||[ "${exitcode}" != "0" ]; do counter=$((counter+1)) - cd "${steamcmddir}" || exit + if [ "${steamcmddir}" ]; then + cd "${steamcmddir}" || exit + fi if [ "${counter}" -le "10" ]; then # Attempt 1-4: Standard attempt. # Attempt 5-6: Validate attempt. @@ -104,18 +106,18 @@ fn_install_server_files_steamcmd(){ if [ "${counter}" -le "4" ]; then if [ "${appid}" == "90" ]; then - ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" -beta "${branch}" +quit + ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" -beta "${branch}" +quit local exitcode=$? else - ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" +quit + ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" +quit local exitcode=$? fi elif [ "${counter}" -ge "5" ]; then if [ "${engine}" == "goldsource" ]; then - ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" -beta "${branch}" validate +quit + ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" -beta "${branch}" validate +quit local exitcode=$? else - ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" validate +quit + ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" validate +quit local exitcode=$? fi fi @@ -133,7 +135,7 @@ fn_install_server_files_steamcmd(){ counter="0" while [ "${counter}" -le "4" ]; do counter=$((counter+1)) - ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" "${branch}" validate +quit + ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" "${branch}" validate +quit local exitcode=$? done fi diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh index 07dbdf9e33..4b6b60bc3d 100644 --- a/lgsm/functions/update_steamcmd.sh +++ b/lgsm/functions/update_steamcmd.sh @@ -16,12 +16,13 @@ fn_update_steamcmd_dl(){ if [ "$(command -v stdbuf)" ]&&[ "${arch}" != "x86_64" ]; then unbuffer="stdbuf -i0 -o0 -e0" fi - - cd "${steamcmddir}" || exit + if [ "${steamcmddir}" ]; then + cd "${steamcmddir}" || exit + fi if [ "${appid}" == "90" ]; then - ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" -beta "${branch}" +quit | tee -a "${lgsmlog}" + ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" -beta "${branch}" +quit | tee -a "${lgsmlog}" else - ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" +quit | tee -a "${lgsmlog}" + ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" +quit | tee -a "${lgsmlog}" fi fix.sh } @@ -50,8 +51,10 @@ fn_update_steamcmd_localbuild(){ fn_update_steamcmd_remotebuild(){ # Gets remote build info. - cd "${steamcmddir}" || exit - remotebuild=$(./steamcmd.sh +login "${steamuser}" "${steampass}" +app_info_update 1 +app_info_print "${appid}" +quit | sed '1,/branches/d' | sed "1,/${branchname}/d" | grep -m 1 buildid | tr -cd '[:digit:]') + if [ "${steamcmddir}" ]; then + cd "${steamcmddir}" || exit + fi + remotebuild=$(${steamcmdcommand} +login "${steamuser}" "${steampass}" +app_info_update 1 +app_info_print "${appid}" +quit | sed '1,/branches/d' | sed "1,/${branchname}/d" | grep -m 1 buildid | tr -cd '[:digit:]') if [ "${installer}" != "1" ]; then fn_print_dots "Checking for update: ${remotelocation}: checking remote build" # Checks if remotebuild variable has been set. From 83e2cbf9be17a5ca01420ed91f1554a42a2d7e18 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 16 Feb 2020 23:48:12 +0000 Subject: [PATCH 08/17] bugs --- lgsm/functions/check_steamcmd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/check_steamcmd.sh b/lgsm/functions/check_steamcmd.sh index 69760f62f7..3c71775193 100644 --- a/lgsm/functions/check_steamcmd.sh +++ b/lgsm/functions/check_steamcmd.sh @@ -13,7 +13,6 @@ fn_install_steamcmd(){ fn_fetch_file "http://media.steampowered.com/client/steamcmd_linux.tar.gz" "${tmpdir}" "steamcmd_linux.tar.gz" fn_dl_extract "${tmpdir}" "steamcmd_linux.tar.gz" "${steamcmddir}" chmod +x "${steamcmddir}/steamcmd.sh" - fi } fn_check_steamcmd_user(){ @@ -71,7 +70,8 @@ fn_check_steamcmd_check(){ if [ "$(command -v steamcmd 2>/dev/null)" ]; then steamcmdcommand="steamcmd" else - steamcmdcommand="${steamcmdcommand}" + steamcmdcommand="./steamcmd.sh" + fi } fn_check_steamcmd_user From 3d43e187420ba4ab23aba19730ed440687b7b3bf Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 17 Feb 2020 00:15:45 +0000 Subject: [PATCH 09/17] code --- lgsm/functions/check_steamcmd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/check_steamcmd.sh b/lgsm/functions/check_steamcmd.sh index 3c71775193..800d737ae6 100644 --- a/lgsm/functions/check_steamcmd.sh +++ b/lgsm/functions/check_steamcmd.sh @@ -48,7 +48,7 @@ fn_check_steamcmd_sh(){ # Installs if missing. if [ ! -f "${steamcmddir}/steamcmd.sh" ]||[ ! "$(command -v steamcmd 2>/dev/null)" ]; then # Debian and Ubuntu uses steamcmd package - if [ -f "/etc/debian_version" ]&&[ ! "$(command -v steamcmd 2>/dev/null)" ]; then + if [ -f "/etc/debian_version" ]&&[ "$(command -v steamcmd 2>/dev/null)" ]; then # Install steamcmd with apt : else From 9e811a7ba0ea9cf80d7cda17bf01cd6b02b45b33 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 17 Feb 2020 00:18:04 +0000 Subject: [PATCH 10/17] code --- lgsm/functions/command_validate.sh | 2 +- lgsm/functions/install_server_files.sh | 2 +- lgsm/functions/update_steamcmd.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lgsm/functions/command_validate.sh b/lgsm/functions/command_validate.sh index 93688892ed..55a58d2669 100644 --- a/lgsm/functions/command_validate.sh +++ b/lgsm/functions/command_validate.sh @@ -15,7 +15,7 @@ fn_validation(){ echo -e "* https://docs.linuxgsm.com/commands/validate" fn_script_log_info "Validating files: SteamCMD" sleep 3 - if [ "${steamcmddir}" ]; then + if [ -d "${steamcmddir}" ]; then cd "${steamcmddir}" || exit fi # Detects if unbuffer command is available for 32 bit distributions only. diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 5534679613..2dc224831d 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -74,7 +74,7 @@ fn_install_server_files_steamcmd(){ counter="0" while [ "${counter}" == "0" ]||[ "${exitcode}" != "0" ]; do counter=$((counter+1)) - if [ "${steamcmddir}" ]; then + if [ -d "${steamcmddir}" ]; then cd "${steamcmddir}" || exit fi if [ "${counter}" -le "10" ]; then diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh index 4b6b60bc3d..fcb2894850 100644 --- a/lgsm/functions/update_steamcmd.sh +++ b/lgsm/functions/update_steamcmd.sh @@ -16,7 +16,7 @@ fn_update_steamcmd_dl(){ if [ "$(command -v stdbuf)" ]&&[ "${arch}" != "x86_64" ]; then unbuffer="stdbuf -i0 -o0 -e0" fi - if [ "${steamcmddir}" ]; then + if [ -d "${steamcmddir}" ]; then cd "${steamcmddir}" || exit fi if [ "${appid}" == "90" ]; then @@ -51,7 +51,7 @@ fn_update_steamcmd_localbuild(){ fn_update_steamcmd_remotebuild(){ # Gets remote build info. - if [ "${steamcmddir}" ]; then + if [ -d "${steamcmddir}" ]; then cd "${steamcmddir}" || exit fi remotebuild=$(${steamcmdcommand} +login "${steamuser}" "${steampass}" +app_info_update 1 +app_info_print "${appid}" +quit | sed '1,/branches/d' | sed "1,/${branchname}/d" | grep -m 1 buildid | tr -cd '[:digit:]') From 6a594b4cf8ab2e8c563a344ad72ff893961e6520 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 19 Feb 2020 22:08:43 +0000 Subject: [PATCH 11/17] code --- lgsm/functions/check_steamcmd.sh | 56 ++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/lgsm/functions/check_steamcmd.sh b/lgsm/functions/check_steamcmd.sh index 800d737ae6..67fe77642b 100644 --- a/lgsm/functions/check_steamcmd.sh +++ b/lgsm/functions/check_steamcmd.sh @@ -7,12 +7,12 @@ local commandname="CHECK" fn_install_steamcmd(){ - if [ ! -d "${steamcmddir}" ]; then - mkdir -pv "${steamcmddir}" - fi - fn_fetch_file "http://media.steampowered.com/client/steamcmd_linux.tar.gz" "${tmpdir}" "steamcmd_linux.tar.gz" - fn_dl_extract "${tmpdir}" "steamcmd_linux.tar.gz" "${steamcmddir}" - chmod +x "${steamcmddir}/steamcmd.sh" + if [ ! -d "${steamcmddir}" ]; then + mkdir -pv "${steamcmddir}" + fi + fn_fetch_file "http://media.steampowered.com/client/steamcmd_linux.tar.gz" "${tmpdir}" "steamcmd_linux.tar.gz" + fn_dl_extract "${tmpdir}" "steamcmd_linux.tar.gz" "${steamcmddir}" + chmod +x "${steamcmddir}/steamcmd.sh" } fn_check_steamcmd_user(){ @@ -43,30 +43,37 @@ fn_check_steamcmd_user(){ fi } -fn_check_steamcmd_sh(){ +fn_check_steamcmd(){ # Checks if SteamCMD exists when starting or updating a server. - # Installs if missing. - if [ ! -f "${steamcmddir}/steamcmd.sh" ]||[ ! "$(command -v steamcmd 2>/dev/null)" ]; then - # Debian and Ubuntu uses steamcmd package - if [ -f "/etc/debian_version" ]&&[ "$(command -v steamcmd 2>/dev/null)" ]; then - # Install steamcmd with apt - : + # Only install if steamcmd package is missing or steamcmd dir is missing. + if [ ! -f "${steamcmddir}/steamcmd.sh" ]&&[ ! "$(command -v steamcmd 2>/dev/null)" ]; then + if [ "${function_selfname}" == "command_install.sh" ]; then + fn_install_steamcmd else - if [ "${function_selfname}" == "command_install.sh" ]; then - fn_install_steamcmd - else - fn_print_error_nl "SteamCMD is missing" - fn_script_log_error "SteamCMD is missing" - fn_install_steamcmd - fi + fn_print_error_nl "SteamCMD is missing" + fn_script_log_error "SteamCMD is missing" + fn_install_steamcmd fi elif [ "${function_selfname}" == "command_install.sh" ]; then - fn_print_information "SteamCMD is already installed..." + fn_print_information "SteamCMD is already installed" fn_print_ok_eol_nl fi } -fn_check_steamcmd_check(){ +fn_check_steamcmd_clear(){ +# Will remove steamcmd dir if steamcmd package is installed. +if [ "$(command -v steamcmd 2>/dev/null)" ]&&[ -d "${steamcmddir}" ]; then + rm -rf "${steamcmddir:?}" + exitcode=$? + if [ ${exitcode} -ne 0 ]; then + fn_script_log_fatal "Removing ${steamcmddir}" + else + fn_script_log_pass "Removing ${steamcmddir}" + fi +fi +} + +fn_check_steamcmd_exec(){ if [ "$(command -v steamcmd 2>/dev/null)" ]; then steamcmdcommand="steamcmd" else @@ -74,6 +81,7 @@ fn_check_steamcmd_check(){ fi } +fn_check_steamcmd +fn_check_steamcmd_clear fn_check_steamcmd_user -fn_check_steamcmd_sh -fn_check_steamcmd_check +fn_check_steamcmd_exec From 4a0c59d2ff7109586efd99fc5f79d5a0a56b5804 Mon Sep 17 00:00:00 2001 From: Stijn Date: Fri, 6 Mar 2020 18:47:02 +0100 Subject: [PATCH 12/17] fix(nmrihserver): add symbolic links to fix the crashes related to missing files (#2668) * Create symlinks after nmrih install * Fixed missing space in nmrih elif statement * Fixed variable assignment in nmrih_symlinks * nmrih_symlinks now use pre-existing location var * Double quotes added in install_nmrih_symlinks * Changed nmrih symlinks from install to fix --- lgsm/functions/core_functions.sh | 5 +++++ lgsm/functions/fix.sh | 2 ++ lgsm/functions/fix_nmrih.sh | 13 +++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 lgsm/functions/fix_nmrih.sh diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh index f1632b48af..ef8d21a0c9 100644 --- a/lgsm/functions/core_functions.sh +++ b/lgsm/functions/core_functions.sh @@ -341,6 +341,11 @@ functionfile="${FUNCNAME[0]}" fn_fetch_function } +fix_nmrih.sh(){ +functionfile="${FUNCNAME[0]}" +fn_fetch_function +} + fix_ro.sh(){ functionfile="${FUNCNAME[0]}" fn_fetch_function diff --git a/lgsm/functions/fix.sh b/lgsm/functions/fix.sh index 4b830f62d7..7c1567edad 100644 --- a/lgsm/functions/fix.sh +++ b/lgsm/functions/fix.sh @@ -49,6 +49,8 @@ if [ "${function_selfname}" != "command_install.sh" ]&&[ -z "${fixbypass}" ]; th fix_ges.sh elif [ "${shortname}" == "ins" ]; then fix_ins.sh + elif [ "${shortname}" == "nmrih" ]; then + fix_nmrih.sh elif [ "${shortname}" == "rust" ]; then fix_rust.sh elif [ "${shortname}" == "rw" ]; then diff --git a/lgsm/functions/fix_nmrih.sh b/lgsm/functions/fix_nmrih.sh new file mode 100644 index 0000000000..8dd5f592c6 --- /dev/null +++ b/lgsm/functions/fix_nmrih.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# LinuxGSM fix_nmrih.sh function +# Author: Denperidge +# Description: Create symlinks for renamed No More Room In Hell serverfiles +# Solution from Steam Community post: https://steamcommunity.com/app/224260/discussions/2/1732089092441769414/ + +ln -s "${serverfiles}/bin/vphysics_srv.so" "${serverfiles}/bin/vphysics.so" +ln -s "${serverfiles}/bin/studiorender_srv.so" "${serverfiles}/bin/studiorender.so" +ln -s "${serverfiles}/bin/soundemittersystem_srv.so" "${serverfiles}/bin/soundemittersystem.so" +ln -s "${serverfiles}/bin/shaderapiempty_srv.so" "${serverfiles}/bin/shaderapiempty.so" +ln -s "${serverfiles}/bin/scenefilecache_srv.so" "${serverfiles}/bin/scenefilecache.so" +ln -s "${serverfiles}/bin/replay_srv.so" "${serverfiles}/bin/replay.so" +ln -s "${serverfiles}/bin/materialsystem_srv.so" "${serverfiles}/bin/materialsystem.so" \ No newline at end of file From df9218df9afe3c6a886526f53ef6322f6fb26e41 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 6 Mar 2020 22:12:56 +0000 Subject: [PATCH 13/17] changed some ! back to -z --- lgsm/functions/check_steamcmd.sh | 2 +- lgsm/functions/command_dev_detect_glibc.sh | 2 +- lgsm/functions/command_fastdl.sh | 2 +- lgsm/functions/core_dl.sh | 2 +- lgsm/functions/info_distro.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lgsm/functions/check_steamcmd.sh b/lgsm/functions/check_steamcmd.sh index 67fe77642b..77f46033d3 100644 --- a/lgsm/functions/check_steamcmd.sh +++ b/lgsm/functions/check_steamcmd.sh @@ -46,7 +46,7 @@ fn_check_steamcmd_user(){ fn_check_steamcmd(){ # Checks if SteamCMD exists when starting or updating a server. # Only install if steamcmd package is missing or steamcmd dir is missing. - if [ ! -f "${steamcmddir}/steamcmd.sh" ]&&[ ! "$(command -v steamcmd 2>/dev/null)" ]; then + if [ ! -f "${steamcmddir}/steamcmd.sh" ]&&[ -z "$(command -v steamcmd 2>/dev/null)" ]; then if [ "${function_selfname}" == "command_install.sh" ]; then fn_install_steamcmd else diff --git a/lgsm/functions/command_dev_detect_glibc.sh b/lgsm/functions/command_dev_detect_glibc.sh index c5c624ed23..e86fb05db0 100644 --- a/lgsm/functions/command_dev_detect_glibc.sh +++ b/lgsm/functions/command_dev_detect_glibc.sh @@ -13,7 +13,7 @@ echo -e "=================================" echo -e "glibc Requirements Checker" echo -e "=================================" -if [ ! "$(command -v objdump)" ]; then +if [ -z "$(command -v objdump)" ]; then fn_print_failure_nl "objdump is missing" fn_script_log_fatal "objdump is missing" core_exit.sh diff --git a/lgsm/functions/command_fastdl.sh b/lgsm/functions/command_fastdl.sh index de74f62f84..d862c7ed85 100644 --- a/lgsm/functions/command_fastdl.sh +++ b/lgsm/functions/command_fastdl.sh @@ -23,7 +23,7 @@ luafastdlfile="lgsm_cl_force_fastdl.lua" luafastdlfullpath="${luasvautorundir}/${luafastdlfile}" # Check if bzip2 is installed. -if [ ! "$(command -v bzip2 2>/dev/null)" ]; then +if [ -z "$(command -v bzip2 2>/dev/null)" ]; then fn_print_fail "bzip2 is not installed" fn_script_log_fatal "bzip2 is not installed" core_exit.sh diff --git a/lgsm/functions/core_dl.sh b/lgsm/functions/core_dl.sh index e4114209f9..24cff68bf7 100644 --- a/lgsm/functions/core_dl.sh +++ b/lgsm/functions/core_dl.sh @@ -256,7 +256,7 @@ fn_update_function(){ } # Check that curl is installed -if [ ! "$(command -v curl 2>/dev/null)" ]; then +if [ -z "$(command -v curl 2>/dev/null)" ]; then echo -e "[ FAIL ] Curl is not installed" exit 1 fi diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 9abb31b974..f40d5b0484 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -71,7 +71,7 @@ glibcversion=$(ldd --version | sed -n '1s/.* //p') ## tmux version # e.g: tmux 1.6 -if [ ! "$(command -V tmux 2>/dev/null)" ]; then +if [ -z "$(command -V tmux 2>/dev/null)" ]; then tmuxv="${red}NOT INSTALLED!${default}" else if [ "$(tmux -V | sed "s/tmux //" | sed -n '1 p' | tr -cd '[:digit:]')" -lt "16" ]; then From e13990694da24ac0c2f773314976383f7e37af87 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 6 Mar 2020 22:18:13 +0000 Subject: [PATCH 14/17] tabs --- lgsm/functions/install_server_files.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 2dc224831d..5c1cfd7fb5 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -9,7 +9,7 @@ local commandaction="Install" local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")") fn_install_server_files(){ - if [ "${shortname}" == "ahl" ]; then + if [ "${shortname}" == "ahl" ]; then remote_fileurl="http://files.linuxgsm.com/ActionHalfLife/action_halflife-1.0.tar.bz2"; local_filedir="${tmpdir}"; local_filename="action_halflife-1.0.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="31430e670692b2eeaa0d1217db4dcb73" elif [ "${shortname}" == "bf1942" ]; then remote_fileurl="http://files.linuxgsm.com/BattleField1942/bf1942_lnxded-1.61-hacked-to-1.612.full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="bf1942_lnxded-1.61-hacked-to-1.612.full.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="a86a5d3cd64ca59abcc9bb9f777c2e5d" @@ -74,9 +74,9 @@ fn_install_server_files_steamcmd(){ counter="0" while [ "${counter}" == "0" ]||[ "${exitcode}" != "0" ]; do counter=$((counter+1)) - if [ -d "${steamcmddir}" ]; then - cd "${steamcmddir}" || exit - fi + if [ -d "${steamcmddir}" ]; then + cd "${steamcmddir}" || exit + fi if [ "${counter}" -le "10" ]; then # Attempt 1-4: Standard attempt. # Attempt 5-6: Validate attempt. From 0ea6a6e6a8b7668cdac56f3641e6928731723994 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 6 Mar 2020 22:56:34 +0000 Subject: [PATCH 15/17] feat(install): use a new linuxgsm domain linuxgsm.download for files (#2698) This will separate out linuxgsm files from the main domain to reduce the change of an ssl change breaking downloads --- lgsm/functions/install_server_files.sh | 52 +++++++++++++------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 5c1cfd7fb5..b217f06806 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -9,62 +9,62 @@ local commandaction="Install" local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")") fn_install_server_files(){ - if [ "${shortname}" == "ahl" ]; then - remote_fileurl="http://files.linuxgsm.com/ActionHalfLife/action_halflife-1.0.tar.bz2"; local_filedir="${tmpdir}"; local_filename="action_halflife-1.0.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="31430e670692b2eeaa0d1217db4dcb73" + if [ "${shortname}" == "ahl" ]; then + remote_fileurl="http://linuxgsm.download/ActionHalfLife/action_halflife-1.0.tar.bz2"; local_filedir="${tmpdir}"; local_filename="action_halflife-1.0.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="31430e670692b2eeaa0d1217db4dcb73" elif [ "${shortname}" == "bf1942" ]; then - remote_fileurl="http://files.linuxgsm.com/BattleField1942/bf1942_lnxded-1.61-hacked-to-1.612.full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="bf1942_lnxded-1.61-hacked-to-1.612.full.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="a86a5d3cd64ca59abcc9bb9f777c2e5d" + remote_fileurl="http://linuxgsm.download/BattleField1942/bf1942_lnxded-1.61-hacked-to-1.612.full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="bf1942_lnxded-1.61-hacked-to-1.612.full.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="a86a5d3cd64ca59abcc9bb9f777c2e5d" elif [ "${shortname}" == "bb" ]; then - remote_fileurl="http://files.linuxgsm.com/BrainBread/brainbread-v1.2-linuxserver.tar.bz2"; local_filedir="${tmpdir}"; local_filename="brainbread-v1.2-linuxserver.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="5c729a7e9eecfa81b71a6a1f7267f0fd" + remote_fileurl="http://linuxgsm.download/BrainBread/brainbread-v1.2-linuxserver.tar.bz2"; local_filedir="${tmpdir}"; local_filename="brainbread-v1.2-linuxserver.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="5c729a7e9eecfa81b71a6a1f7267f0fd" elif [ "${shortname}" == "cod" ]; then - remote_fileurl="http://files.linuxgsm.com/CallOfDuty/cod-lnxded-1.5b-full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="cod-lnxded-1.5-large.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="19629895a4cf6fd8f6d1ee198b5304cd" + remote_fileurl="http://linuxgsm.download/CallOfDuty/cod-lnxded-1.5b-full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="cod-lnxded-1.5-large.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="19629895a4cf6fd8f6d1ee198b5304cd" elif [ "${shortname}" == "coduo" ]; then - remote_fileurl="http://files.linuxgsm.com/CallOfDutyUnitedOffensive/coduo-lnxded-1.51b-full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="coduo-lnxded-1.51b-full.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="f1804ef13036e2b4ab535db000b19e97" + remote_fileurl="http://linuxgsm.download/CallOfDutyUnitedOffensive/coduo-lnxded-1.51b-full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="coduo-lnxded-1.51b-full.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="f1804ef13036e2b4ab535db000b19e97" elif [ "${shortname}" == "cod2" ]; then - remote_fileurl="http://files.linuxgsm.com/CallOfDuty2/cod2-lnxded-1.3-full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="cod2-lnxded-1.3-full.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="078128f83d06dc3d7699428dc2870214" + remote_fileurl="http://linuxgsm.download/CallOfDuty2/cod2-lnxded-1.3-full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="cod2-lnxded-1.3-full.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="078128f83d06dc3d7699428dc2870214" elif [ "${shortname}" == "cod4" ]; then - remote_fileurl="http://files.linuxgsm.com/CallOfDuty4/cod4x18_1772_dedrun.tar.bz2"; local_filedir="${tmpdir}"; local_filename="cod4x18_1772_dedrun.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="de29f29d79f9cc24574b838daa501e46" + remote_fileurl="http://linuxgsm.download/CallOfDuty4/cod4x18_1772_dedrun.tar.bz2"; local_filedir="${tmpdir}"; local_filename="cod4x18_1772_dedrun.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="de29f29d79f9cc24574b838daa501e46" elif [ "${shortname}" == "codwaw" ]; then - remote_fileurl="http://files.linuxgsm.com/CallOfDutyWorldAtWar/codwaw-lnxded-1.7-full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="codwaw-lnxded-1.7-full.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="0489697ff3bf678c109bfb377d1b7895" + remote_fileurl="http://linuxgsm.download/CallOfDutyWorldAtWar/codwaw-lnxded-1.7-full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="codwaw-lnxded-1.7-full.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="0489697ff3bf678c109bfb377d1b7895" elif [ "${shortname}" == "etl" ]; then - remote_fileurl="http://files.linuxgsm.com/WolfensteinEnemyTerritory/etlegacy-v2.75-i386-et-260b.tar.bz2"; local_filedir="${tmpdir}"; local_filename="etlegacy-v2.75-i386-et-260b.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="92d7d4c26e0a295daed78cef623eeabb" + remote_fileurl="http://linuxgsm.download/WolfensteinEnemyTerritory/etlegacy-v2.75-i386-et-260b.tar.bz2"; local_filedir="${tmpdir}"; local_filename="etlegacy-v2.75-i386-et-260b.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="92d7d4c26e0a295daed78cef623eeabb" elif [ "${shortname}" == "ges" ]; then - remote_fileurl="http://files.linuxgsm.com/GoldenEyeSource/GoldenEye_Source_v5.0.6_full_server.tar.bz2"; local_filedir="${tmpdir}"; local_filename="GoldenEye_Source_v5.0.6_full_server.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="c45c16293096706e8b5e2cd64a6f2931" + remote_fileurl="http://linuxgsm.download/GoldenEyeSource/GoldenEye_Source_v5.0.6_full_server.tar.bz2"; local_filedir="${tmpdir}"; local_filename="GoldenEye_Source_v5.0.6_full_server.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="c45c16293096706e8b5e2cd64a6f2931" elif [ "${shortname}" == "mohaa" ]; then - remote_fileurl="http://files.linuxgsm.com/MedalofHonorAlliedAssault/moh_revival_v1.12_RC3.5.1.tar.bz2"; local_filedir="${tmpdir}"; local_filename="moh_revival_v1.12_RC3.5.1.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="9d5924486a0cf5e46dd063216aad05c1" + remote_fileurl="http://linuxgsm.download/MedalofHonorAlliedAssault/moh_revival_v1.12_RC3.5.1.tar.bz2"; local_filedir="${tmpdir}"; local_filename="moh_revival_v1.12_RC3.5.1.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="9d5924486a0cf5e46dd063216aad05c1" elif [ "${shortname}" == "ns" ]; then - remote_fileurl="http://files.linuxgsm.com/NaturalSelection/ns_dedicated_server_v32.tar.bz2"; local_filedir="${tmpdir}"; local_filename="ns_dedicated_server_v32.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="499cf63324b76925ada6baf5f2eacd67" + remote_fileurl="http://linuxgsm.download/NaturalSelection/ns_dedicated_server_v32.tar.bz2"; local_filedir="${tmpdir}"; local_filename="ns_dedicated_server_v32.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="499cf63324b76925ada6baf5f2eacd67" elif [ "${shortname}" == "q2" ]; then - remote_fileurl="http://files.linuxgsm.com/Quake2/quake2-3.20-glibc-i386-full-linux2.0.tar.bz2"; local_filedir="${tmpdir}"; local_filename="quake2-3.20-glibc-i386-full-linux2.0.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="0b8c7e2d51f40b56b328c69e986e7c5f" + remote_fileurl="http://linuxgsm.download/Quake2/quake2-3.20-glibc-i386-full-linux2.0.tar.bz2"; local_filedir="${tmpdir}"; local_filename="quake2-3.20-glibc-i386-full-linux2.0.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="0b8c7e2d51f40b56b328c69e986e7c5f" elif [ "${shortname}" == "q3" ]; then - remote_fileurl="http://files.linuxgsm.com/Quake3/quake3-1.32c-x86-full-linux.tar.bz2"; local_filedir="${tmpdir}"; local_filename="quake3-1.32c-x86-full-linux.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="fd7258d827474f67663dda297bff4306" + remote_fileurl="http://linuxgsm.download/Quake3/quake3-1.32c-x86-full-linux.tar.bz2"; local_filedir="${tmpdir}"; local_filename="quake3-1.32c-x86-full-linux.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="fd7258d827474f67663dda297bff4306" elif [ "${shortname}" == "qw" ]; then - remote_fileurl="http://files.linuxgsm.com/QuakeWorld/nquake.server.linux.190506.full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="nquake.server.linux.190506.full.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="74405ec030463c5e1175e776ab572d32" + remote_fileurl="http://linuxgsm.download/QuakeWorld/nquake.server.linux.190506.full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="nquake.server.linux.190506.full.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="74405ec030463c5e1175e776ab572d32" elif [ "${shortname}" == "rtcw" ]; then - remote_fileurl="http://files.linuxgsm.com/ReturnToCastleWolfenstein/iortcw-1.51c-x86_64-server-linux-20190507.tar.bz2"; local_filedir="${tmpdir}"; local_filename="iortcw-1.51c-x86_64-server-linux-20190507.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="6a3be9700372b228d1187422464e4212" + remote_fileurl="http://linuxgsm.download/ReturnToCastleWolfenstein/iortcw-1.51c-x86_64-server-linux-20190507.tar.bz2"; local_filedir="${tmpdir}"; local_filename="iortcw-1.51c-x86_64-server-linux-20190507.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="6a3be9700372b228d1187422464e4212" elif [ "${shortname}" == "sfc" ]; then - remote_fileurl="http://files.linuxgsm.com/SourceFortsClassic/SFClassic-1.0-RC7-fix.tar.bz2"; local_filedir="${tmpdir}"; local_filename="SFClassic-1.0-RC7-fix.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="e0d4cfd298a8a356053f92b1fa7d1002" + remote_fileurl="http://linuxgsm.download/SourceFortsClassic/SFClassic-1.0-RC7-fix.tar.bz2"; local_filedir="${tmpdir}"; local_filename="SFClassic-1.0-RC7-fix.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="e0d4cfd298a8a356053f92b1fa7d1002" elif [ "${shortname}" == "sof2" ]; then - remote_fileurl="http://files.linuxgsm.com/SoldierOfFortune2/sof2gold-1.03.tar.bz2"; local_filedir="${tmpdir}"; local_filename="sof2gold-1.03.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="871b1dc0dafeeace65b198119e8fa200" + remote_fileurl="http://linuxgsm.download/SoldierOfFortune2/sof2gold-1.03.tar.bz2"; local_filedir="${tmpdir}"; local_filename="sof2gold-1.03.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="871b1dc0dafeeace65b198119e8fa200" elif [ "${shortname}" == "ts" ]; then - remote_fileurl="http://files.linuxgsm.com/TheSpecialists/ts-3-linux-final.tar.bz2"; local_filedir="${tmpdir}"; local_filename="ts-3-linux-final.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="38e8a8325339f85a7745117802f940b7" + remote_fileurl="http://linuxgsm.download/TheSpecialists/ts-3-linux-final.tar.bz2"; local_filedir="${tmpdir}"; local_filename="ts-3-linux-final.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="38e8a8325339f85a7745117802f940b7" elif [ "${shortname}" == "ut2k4" ]; then - remote_fileurl="http://files.linuxgsm.com/UnrealTournament2004/ut2004-server-3369-2-ultimate-linux.tar.bz2"; local_filedir="${tmpdir}"; local_filename="ut2004-server-3369-2-ultimate-linux.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="67c5e2cd9c2a4b04f163962ee41eff54" + remote_fileurl="http://linuxgsm.download/UnrealTournament2004/ut2004-server-3369-2-ultimate-linux.tar.bz2"; local_filedir="${tmpdir}"; local_filename="ut2004-server-3369-2-ultimate-linux.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="67c5e2cd9c2a4b04f163962ee41eff54" elif [ "${shortname}" == "ut99" ]; then - remote_fileurl="http://files.linuxgsm.com/UnrealTournament99/ut99-server-451-ultimate-linux.tar.bz2"; local_filedir="${tmpdir}"; local_filename="ut99-server-451-ultimate-linux.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="49cb24d0550ff6ddeaba6007045c6edd" + remote_fileurl="http://linuxgsm.download/UnrealTournament99/ut99-server-451-ultimate-linux.tar.bz2"; local_filedir="${tmpdir}"; local_filename="ut99-server-451-ultimate-linux.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="49cb24d0550ff6ddeaba6007045c6edd" elif [ "${shortname}" == "ut" ]; then remote_fileurl="https://s3.amazonaws.com/unrealtournament/UnrealTournament-Client-XAN-3395761-Linux.zip"; local_filedir="${tmpdir}"; local_filename="UnrealTournament-Server-XAN-3395761-Linux.zip"; chmodx="noexecute" run="norun"; force="noforce"; md5="f04ad5b96865b19613303331ff4075eb" elif [ "${shortname}" == "ut3" ]; then - remote_fileurl="http://files.linuxgsm.com/UnrealTournament3/UT3-linux-server-2.1.tar.bz2"; local_filedir="${tmpdir}"; local_filename="UT3-linux-server-2.1.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="2527437b46f1b47f20228d27d72395a6" + remote_fileurl="http://linuxgsm.download/UnrealTournament3/UT3-linux-server-2.1.tar.bz2"; local_filedir="${tmpdir}"; local_filename="UT3-linux-server-2.1.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="2527437b46f1b47f20228d27d72395a6" elif [ "${shortname}" == "vs" ]; then - remote_fileurl="http://files.linuxgsm.com/VampireSlayer/vs_l-6.0_full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="vs_l-6.0_full.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="38a79e44b98578bbdc5b15818493a066" + remote_fileurl="http://linuxgsm.download/VampireSlayer/vs_l-6.0_full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="vs_l-6.0_full.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="38a79e44b98578bbdc5b15818493a066" elif [ "${shortname}" == "wet" ]; then - remote_fileurl="http://files.linuxgsm.com/WolfensteinEnemyTerritory/enemy-territory.260b.tar.bz2"; local_filedir="${tmpdir}"; local_filename="enemy-territory.260b.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="f833f514bfcdd46b42c111f83350c5a7" + remote_fileurl="http://linuxgsm.download/WolfensteinEnemyTerritory/enemy-territory.260b.tar.bz2"; local_filedir="${tmpdir}"; local_filename="enemy-territory.260b.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="f833f514bfcdd46b42c111f83350c5a7" elif [ "${shortname}" == "samp" ]; then remote_fileurl="https://files.sa-mp.com/samp037svr_R2-1.tar.gz"; local_filedir="${tmpdir}"; local_filename="samp037svr_R2-1.tar.gz"; chmodx="nochmodx" run="norun"; force="noforce"; md5="93705e165550c97484678236749198a4" elif [ "${shortname}" == "sol" ]; then remote_fileurl="https://static.soldat.pl/downloads/soldatserver2.8.1_1.7.1.zip"; local_filedir="${tmpdir}"; local_filename="soldatserver2.8.1_1.7.1.zip"; chmodx="nochmodx" run="norun"; force="noforce"; md5="994409c28520425965dec5c71ccb55e1" elif [ "${shortname}" == "zmr" ]; then - remote_fileurl="http://files.linuxgsm.com/ZombieMasterReborn/zombie_master_reborn_b5_2.tar.bz2"; local_filedir="${tmpdir}"; local_filename="zombie_master_reborn_b5_2.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="d52ef2db376f5d21e3a4ceca85ec8761" + remote_fileurl="http://linuxgsm.download/ZombieMasterReborn/zombie_master_reborn_b5_2.tar.bz2"; local_filedir="${tmpdir}"; local_filename="zombie_master_reborn_b5_2.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="d52ef2db376f5d21e3a4ceca85ec8761" fi fn_fetch_file "${remote_fileurl}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${md5}" fn_dl_extract "${local_filedir}" "${local_filename}" "${serverfiles}" From 5d5040b3d6b89e79e20d381fb8a64c2b23dbe646 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 6 Mar 2020 23:04:44 +0000 Subject: [PATCH 16/17] add steamcmd to packages --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3ad78ad88..48676a0fe0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ addons: - libcurl4-openssl-dev - libdw-dev - cmake + - steamcmd jobs: include: @@ -31,13 +32,13 @@ jobs: name: "code coverage" script: bash tests/tests_kcov.sh; kcov --bash-method=DEBUG coverage tests/tests_mcserver.sh - script: bash tests/tests_mcserver.sh - name: "Minecraft" - - script: bash tests/tests_jc2server.sh + name: "Minecraft" + - script: bash tests/tests_jc2server.sh name: "Just Cause 2" - script: bash tests/tests_fctrserver.sh - name: "Factorio" + name: "Factorio" - script: bash tests/tests_ts3server.sh - name: "Teamspeak 3" + name: "Teamspeak 3" - script: bash tests/tests_defaultcfg/tests_defaultcfg.sh name: "_default.cfg checks" after_success: From 9f91d4ee0100c7ce78352565fa8eec953914c71f Mon Sep 17 00:00:00 2001 From: Frisasky Date: Sat, 7 Mar 2020 07:05:36 +0800 Subject: [PATCH 17/17] feat(newserver): Unreal Tournament 4 (#2644) Co-authored-by: Daniel Gibbs --- lgsm/data/serverlist.csv | 1 + lgsm/functions/info_config.sh | 12 ++++++++++++ lgsm/functions/info_messages.sh | 11 ++++++++++- lgsm/functions/info_parms.sh | 6 ++++++ lgsm/functions/install_server_files.sh | 2 +- 5 files changed, 30 insertions(+), 2 deletions(-) diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index 5c2e6a6aef..5f4398d286 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -92,6 +92,7 @@ ts3,ts3server,Teamspeak 3 tu,tuserver,Tower Unite tw,twserver,Teeworlds unt,untserver,Unturned +ut,utserver,Unreal Tournament ut2k4,ut2k4server,Unreal Tournament 2004 ut3,ut3server,Unreal Tournament 3 ut99,ut99server,Unreal Tournament 99 diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index bd511cc69c..2ad78197a6 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -1022,6 +1022,16 @@ fn_info_config_unreal3(){ fi } +fn_info_config_ut(){ + if [ ! -f "${servercfgfullpath}" ]; then + servername="${unavailable}" + else + servername=$(grep "ServerName" "${servercfgfullpath}" | awk -F '=' '{print $2}') + + # Not set + servername=${servername:-"NOT SET"} + fi +} fn_info_config_warfork(){ if [ ! -f "${servercfgfullpath}" ]; then @@ -1459,6 +1469,8 @@ elif [ "${engine}" == "unreal2" ]; then # Unreal 3 engine elif [ "${engine}" == "unreal3" ]; then fn_info_config_unreal3 +elif [ "${shortname}" == "ut" ]; then + fn_info_config_ut # 7 Day To Die (unity3d) elif [ "${shortname}" == "sdtd" ]; then fn_info_config_sdtd diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 291def5a91..a8a1042df7 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -1239,7 +1239,14 @@ fn_info_message_unturned(){ } | column -s $'\t' -t } - +fn_info_message_ut(){ + echo -e "netstat -atunp | grep UE4Server" + echo -e "" + { + echo -e "${lightblue}DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL${default}" + echo -e "> Game\tINBOUND\t${port}\tudp" + } | column -s $'\t' -t +} fn_info_message_kf2(){ fn_info_message_password_strip @@ -1422,6 +1429,8 @@ fn_info_message_select_engine(){ fn_info_message_teeworlds elif [ "${shortname}" == "unt" ]; then fn_info_message_unturned + elif [ "${shortname}" == "ut" ]; then + fn_info_message_ut elif [ "${shortname}" == "mc" ]; then fn_info_message_minecraft elif [ "${shortname}" == "mh" ]; then diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh index 6cafc86ad4..37bd56416d 100644 --- a/lgsm/functions/info_parms.sh +++ b/lgsm/functions/info_parms.sh @@ -232,6 +232,10 @@ fn_info_parms_unturned(){ queryport=$((port + 1)) } +fn_info_parms_ut(){ + port=${port:-"0"} +} + fn_info_parms_wf(){ port=${port:-"0"} queryport="${port:-"0"}" @@ -311,6 +315,8 @@ elif [ "${engine}" == "unreal3" ]; then fn_info_parms_unreal3 elif [ "${shortname}" == "unt" ]; then fn_info_parms_unturned +elif [ "${shortname}" == "ut" ]; then + fn_info_parms_ut # Warfork elif [ "${shortname}" == "wf" ]; then fn_info_parms_wf diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index b217f06806..b9069db531 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -52,7 +52,7 @@ fn_install_server_files(){ elif [ "${shortname}" == "ut99" ]; then remote_fileurl="http://linuxgsm.download/UnrealTournament99/ut99-server-451-ultimate-linux.tar.bz2"; local_filedir="${tmpdir}"; local_filename="ut99-server-451-ultimate-linux.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="49cb24d0550ff6ddeaba6007045c6edd" elif [ "${shortname}" == "ut" ]; then - remote_fileurl="https://s3.amazonaws.com/unrealtournament/UnrealTournament-Client-XAN-3395761-Linux.zip"; local_filedir="${tmpdir}"; local_filename="UnrealTournament-Server-XAN-3395761-Linux.zip"; chmodx="noexecute" run="norun"; force="noforce"; md5="f04ad5b96865b19613303331ff4075eb" + remote_fileurl="http://linuxgsm.download/UnrealTournament/UnrealTournament-Server-XAN-3525360-Linux.zip"; local_filedir="${tmpdir}"; local_filename="UnrealTournament-Server-XAN-3525360-Linux.zip"; chmodx="noexecute" run="norun"; force="noforce"; md5="cad730ad6793ba6261f9a341ad7396eb" elif [ "${shortname}" == "ut3" ]; then remote_fileurl="http://linuxgsm.download/UnrealTournament3/UT3-linux-server-2.1.tar.bz2"; local_filedir="${tmpdir}"; local_filename="UT3-linux-server-2.1.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="2527437b46f1b47f20228d27d72395a6" elif [ "${shortname}" == "vs" ]; then