From fa6cfe408613e2fe3dae63eae8e87c4e7efb9aaf Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 12 May 2019 22:28:27 +0100 Subject: [PATCH] feat(ui): add message display setting (#2357) * setting to change the time in seconds messages are displayed. Default 0.5s * Travis-CI messages have a 0s delay to speed up testing. --- .../config-lgsm/arkserver/_default.cfg | 3 ++ .../config-lgsm/arma3server/_default.cfg | 3 ++ .../config-lgsm/bb2server/_default.cfg | 3 ++ .../config-lgsm/bbserver/_default.cfg | 3 ++ .../config-lgsm/bdserver/_default.cfg | 3 ++ .../config-lgsm/bf1942server/_default.cfg | 3 ++ .../config-lgsm/bmdmserver/_default.cfg | 3 ++ .../config-lgsm/boserver/_default.cfg | 3 ++ .../config-lgsm/bsserver/_default.cfg | 3 ++ .../config-lgsm/bt1944server/_default.cfg | 3 ++ .../config-lgsm/ccserver/_default.cfg | 3 ++ .../config-lgsm/cod2server/_default.cfg | 3 ++ .../config-lgsm/cod4server/_default.cfg | 3 ++ .../config-lgsm/codserver/_default.cfg | 3 ++ .../config-lgsm/coduoserver/_default.cfg | 3 ++ .../config-lgsm/codwawserver/_default.cfg | 3 ++ .../config-lgsm/csczserver/_default.cfg | 3 ++ .../config-lgsm/csgoserver/_default.cfg | 3 ++ .../config-lgsm/csserver/_default.cfg | 3 ++ .../config-lgsm/cssserver/_default.cfg | 3 ++ .../config-lgsm/dabserver/_default.cfg | 3 ++ .../config-lgsm/dmcserver/_default.cfg | 3 ++ .../config-lgsm/dodserver/_default.cfg | 3 ++ .../config-lgsm/dodsserver/_default.cfg | 3 ++ .../config-lgsm/doiserver/_default.cfg | 3 ++ .../config-lgsm/dstserver/_default.cfg | 3 ++ .../config-lgsm/dysserver/_default.cfg | 3 ++ .../config-lgsm/ecoserver/_default.cfg | 3 ++ .../config-lgsm/emserver/_default.cfg | 3 ++ .../config-lgsm/etlserver/_default.cfg | 3 ++ .../config-lgsm/fctrserver/_default.cfg | 3 ++ .../config-lgsm/fofserver/_default.cfg | 3 ++ .../config-lgsm/gesserver/_default.cfg | 3 ++ .../config-lgsm/gmodserver/_default.cfg | 3 ++ .../config-lgsm/hl2dmserver/_default.cfg | 3 ++ .../config-lgsm/hldmserver/_default.cfg | 3 ++ .../config-lgsm/hldmsserver/_default.cfg | 3 ++ .../config-lgsm/hwserver/_default.cfg | 3 ++ .../config-lgsm/insserver/_default.cfg | 3 ++ .../config-lgsm/inssserver/_default.cfg | 3 ++ .../config-lgsm/iosserver/_default.cfg | 3 ++ .../config-lgsm/jc2server/_default.cfg | 3 ++ .../config-lgsm/jc3server/_default.cfg | 3 ++ .../config-lgsm/kf2server/_default.cfg | 3 ++ .../config-lgsm/kfserver/_default.cfg | 3 ++ .../config-lgsm/l4d2server/_default.cfg | 3 ++ .../config-lgsm/l4dserver/_default.cfg | 3 ++ .../config-lgsm/mcserver/_default.cfg | 3 ++ .../config-lgsm/mhserver/_default.cfg | 3 ++ .../config-lgsm/mtaserver/_default.cfg | 3 ++ .../config-lgsm/mumbleserver/_default.cfg | 3 ++ .../config-lgsm/ndserver/_default.cfg | 3 ++ .../config-lgsm/nmrihserver/_default.cfg | 3 ++ .../config-lgsm/ns2cserver/_default.cfg | 3 ++ .../config-lgsm/ns2server/_default.cfg | 3 ++ .../config-lgsm/nsserver/_default.cfg | 3 ++ .../config-lgsm/opforserver/_default.cfg | 3 ++ .../config-lgsm/pcserver/_default.cfg | 3 ++ .../config-lgsm/pstbsserver/_default.cfg | 3 ++ .../config-lgsm/pvkiiserver/_default.cfg | 3 ++ .../config-lgsm/pzserver/_default.cfg | 3 ++ .../config-lgsm/q2server/_default.cfg | 3 ++ .../config-lgsm/q3server/_default.cfg | 3 ++ .../config-lgsm/qlserver/_default.cfg | 3 ++ .../config-lgsm/qwserver/_default.cfg | 3 ++ .../config-lgsm/ricochetserver/_default.cfg | 3 ++ .../config-lgsm/roserver/_default.cfg | 3 ++ .../config-lgsm/rtcwserver/_default.cfg | 3 ++ .../config-lgsm/rustserver/_default.cfg | 3 ++ .../config-lgsm/rwserver/_default.cfg | 3 ++ .../config-lgsm/sampserver/_default.cfg | 3 ++ .../config-lgsm/sbotsserver/_default.cfg | 3 ++ .../config-lgsm/sbserver/_default.cfg | 3 ++ .../config-lgsm/sdtdserver/_default.cfg | 3 ++ .../config-lgsm/squadserver/_default.cfg | 3 ++ .../config-lgsm/ss3server/_default.cfg | 3 ++ .../config-lgsm/stserver/_default.cfg | 3 ++ .../config-lgsm/svenserver/_default.cfg | 3 ++ .../config-lgsm/terrariaserver/_default.cfg | 3 ++ .../config-lgsm/tf2server/_default.cfg | 3 ++ .../config-lgsm/tfcserver/_default.cfg | 3 ++ .../config-lgsm/ts3server/_default.cfg | 3 ++ .../config-lgsm/tuserver/_default.cfg | 3 ++ .../config-lgsm/twserver/_default.cfg | 3 ++ .../config-lgsm/untserver/_default.cfg | 3 ++ .../config-lgsm/ut2k4server/_default.cfg | 3 ++ .../config-lgsm/ut3server/_default.cfg | 3 ++ .../config-lgsm/ut99server/_default.cfg | 3 ++ .../config-lgsm/utserver/_default.cfg | 3 ++ .../config-lgsm/vsserver/_default.cfg | 3 ++ .../config-lgsm/wetserver/_default.cfg | 3 ++ .../config-lgsm/wurmserver/_default.cfg | 3 ++ .../config-lgsm/zpsserver/_default.cfg | 3 ++ lgsm/functions/alert_email.sh | 2 +- lgsm/functions/alert_ifttt.sh | 3 +- lgsm/functions/alert_mailgun.sh | 3 +- lgsm/functions/alert_pushbullet.sh | 1 - lgsm/functions/alert_pushover.sh | 3 +- lgsm/functions/alert_telegram.sh | 1 - lgsm/functions/check_config.sh | 5 -- lgsm/functions/check_deps.sh | 10 ++-- lgsm/functions/check_glibc.sh | 4 +- lgsm/functions/check_ip.sh | 4 -- lgsm/functions/check_logs.sh | 1 - lgsm/functions/check_permissions.sh | 7 +-- lgsm/functions/check_steamcmd.sh | 1 - lgsm/functions/check_system_requirements.sh | 4 +- lgsm/functions/command_backup.sh | 19 ++----- lgsm/functions/command_console.sh | 3 -- lgsm/functions/command_debug.sh | 3 -- lgsm/functions/command_fastdl.sh | 14 ++--- lgsm/functions/command_mods_install.sh | 1 - lgsm/functions/command_mods_remove.sh | 8 +-- lgsm/functions/command_mods_update.sh | 4 +- lgsm/functions/command_monitor.sh | 10 ---- lgsm/functions/command_postdetails.sh | 4 +- lgsm/functions/command_start.sh | 12 ++--- lgsm/functions/command_stop.sh | 20 +++---- lgsm/functions/command_test_alert.sh | 1 - lgsm/functions/command_ts3_server_pass.sh | 2 - lgsm/functions/command_update.sh | 1 - lgsm/functions/command_update_linuxgsm.sh | 1 - lgsm/functions/command_validate.sh | 13 ++--- lgsm/functions/command_wipe.sh | 53 ++++++++----------- lgsm/functions/core_dl.sh | 6 +-- lgsm/functions/core_messages.sh | 34 +++++++++--- lgsm/functions/fix.sh | 6 +-- lgsm/functions/fix_kf.sh | 8 +-- lgsm/functions/fix_kf2.sh | 4 +- lgsm/functions/fix_mta.sh | 2 +- lgsm/functions/fix_ro.sh | 10 ++-- lgsm/functions/fix_ut.sh | 2 +- lgsm/functions/fix_ut2k4.sh | 8 +-- lgsm/functions/fix_ut3.sh | 4 +- lgsm/functions/install_config.sh | 24 ++++----- lgsm/functions/install_dst_token.sh | 2 +- lgsm/functions/install_eula.sh | 2 +- lgsm/functions/install_factorio_save.sh | 2 +- lgsm/functions/install_gslt.sh | 4 +- lgsm/functions/install_logs.sh | 4 +- lgsm/functions/install_server_dir.sh | 2 +- lgsm/functions/install_server_files.sh | 2 +- lgsm/functions/install_squad_license.sh | 4 +- lgsm/functions/install_steamcmd.sh | 2 +- lgsm/functions/install_ts3db.sh | 9 ++-- lgsm/functions/install_ut2k4_key.sh | 2 +- lgsm/functions/logs.sh | 4 +- lgsm/functions/mods_core.sh | 16 +++--- lgsm/functions/update_factorio.sh | 12 +---- lgsm/functions/update_minecraft.sh | 14 +---- lgsm/functions/update_mta.sh | 14 +---- lgsm/functions/update_mumble.sh | 12 +---- lgsm/functions/update_steamcmd.sh | 20 ++----- lgsm/functions/update_ts3.sh | 23 +++----- tests/tests_fctrserver.sh | 1 - tests/tests_jc2server.sh | 1 - tests/tests_mcserver.sh | 3 +- tests/tests_ts3server.sh | 1 - 158 files changed, 450 insertions(+), 311 deletions(-) diff --git a/lgsm/config-default/config-lgsm/arkserver/_default.cfg b/lgsm/config-default/config-lgsm/arkserver/_default.cfg index 47189ae12..9306d3b4e 100644 --- a/lgsm/config-default/config-lgsm/arkserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/arkserver/_default.cfg @@ -88,6 +88,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="376030" diff --git a/lgsm/config-default/config-lgsm/arma3server/_default.cfg b/lgsm/config-default/config-lgsm/arma3server/_default.cfg index c7f9f1187..07fff7375 100644 --- a/lgsm/config-default/config-lgsm/arma3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/arma3server/_default.cfg @@ -102,6 +102,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="233780" diff --git a/lgsm/config-default/config-lgsm/bb2server/_default.cfg b/lgsm/config-default/config-lgsm/bb2server/_default.cfg index 17014193d..e04d61e72 100644 --- a/lgsm/config-default/config-lgsm/bb2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/bb2server/_default.cfg @@ -92,6 +92,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="475370" diff --git a/lgsm/config-default/config-lgsm/bbserver/_default.cfg b/lgsm/config-default/config-lgsm/bbserver/_default.cfg index 0002910f9..2b891d4ed 100644 --- a/lgsm/config-default/config-lgsm/bbserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bbserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/bdserver/_default.cfg b/lgsm/config-default/config-lgsm/bdserver/_default.cfg index ad5bc4a7b..602936e6d 100644 --- a/lgsm/config-default/config-lgsm/bdserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bdserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="817300" diff --git a/lgsm/config-default/config-lgsm/bf1942server/_default.cfg b/lgsm/config-default/config-lgsm/bf1942server/_default.cfg index 0323fa414..c0f799198 100644 --- a/lgsm/config-default/config-lgsm/bf1942server/_default.cfg +++ b/lgsm/config-default/config-lgsm/bf1942server/_default.cfg @@ -79,6 +79,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Battlefield: 1942" diff --git a/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg b/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg index d3036144e..4eb1ceec3 100644 --- a/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg @@ -92,6 +92,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="346680" diff --git a/lgsm/config-default/config-lgsm/boserver/_default.cfg b/lgsm/config-default/config-lgsm/boserver/_default.cfg index c9fc1c954..77a5b0b4b 100644 --- a/lgsm/config-default/config-lgsm/boserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/boserver/_default.cfg @@ -85,6 +85,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="416880" diff --git a/lgsm/config-default/config-lgsm/bsserver/_default.cfg b/lgsm/config-default/config-lgsm/bsserver/_default.cfg index 3792882b1..e9294e0a4 100644 --- a/lgsm/config-default/config-lgsm/bsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bsserver/_default.cfg @@ -96,6 +96,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="228780" diff --git a/lgsm/config-default/config-lgsm/bt1944server/_default.cfg b/lgsm/config-default/config-lgsm/bt1944server/_default.cfg index 22b3f4e4d..dcb01817b 100644 --- a/lgsm/config-default/config-lgsm/bt1944server/_default.cfg +++ b/lgsm/config-default/config-lgsm/bt1944server/_default.cfg @@ -84,6 +84,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="805140" diff --git a/lgsm/config-default/config-lgsm/ccserver/_default.cfg b/lgsm/config-default/config-lgsm/ccserver/_default.cfg index c85af6137..f07e8bf87 100644 --- a/lgsm/config-default/config-lgsm/ccserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ccserver/_default.cfg @@ -87,6 +87,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="383410" diff --git a/lgsm/config-default/config-lgsm/cod2server/_default.cfg b/lgsm/config-default/config-lgsm/cod2server/_default.cfg index 61b0a56e8..1bbc6abb2 100644 --- a/lgsm/config-default/config-lgsm/cod2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/cod2server/_default.cfg @@ -82,6 +82,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Call of Duty 2" diff --git a/lgsm/config-default/config-lgsm/cod4server/_default.cfg b/lgsm/config-default/config-lgsm/cod4server/_default.cfg index a46248950..d2da96d90 100644 --- a/lgsm/config-default/config-lgsm/cod4server/_default.cfg +++ b/lgsm/config-default/config-lgsm/cod4server/_default.cfg @@ -82,6 +82,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Call of Duty 4" diff --git a/lgsm/config-default/config-lgsm/codserver/_default.cfg b/lgsm/config-default/config-lgsm/codserver/_default.cfg index 67c6dc918..6797cf433 100644 --- a/lgsm/config-default/config-lgsm/codserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/codserver/_default.cfg @@ -82,6 +82,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Call of Duty" diff --git a/lgsm/config-default/config-lgsm/coduoserver/_default.cfg b/lgsm/config-default/config-lgsm/coduoserver/_default.cfg index c61d3f96b..ea142dee9 100644 --- a/lgsm/config-default/config-lgsm/coduoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/coduoserver/_default.cfg @@ -82,6 +82,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Call of Duty: United Offensive" diff --git a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg index 4296b4b7c..87ddb9468 100644 --- a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg @@ -82,6 +82,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Call of Duty: World at War" diff --git a/lgsm/config-default/config-lgsm/csczserver/_default.cfg b/lgsm/config-default/config-lgsm/csczserver/_default.cfg index 363d82e6b..f8b17a3ac 100644 --- a/lgsm/config-default/config-lgsm/csczserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/csczserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg index 8fb88de8b..3bd16b090 100644 --- a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg @@ -112,6 +112,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="740" diff --git a/lgsm/config-default/config-lgsm/csserver/_default.cfg b/lgsm/config-default/config-lgsm/csserver/_default.cfg index c3f087a0f..c465ad5c0 100644 --- a/lgsm/config-default/config-lgsm/csserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/csserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/cssserver/_default.cfg b/lgsm/config-default/config-lgsm/cssserver/_default.cfg index 47ba05037..945327cf8 100644 --- a/lgsm/config-default/config-lgsm/cssserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/cssserver/_default.cfg @@ -92,6 +92,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="232330" diff --git a/lgsm/config-default/config-lgsm/dabserver/_default.cfg b/lgsm/config-default/config-lgsm/dabserver/_default.cfg index efa06c0a0..b3c062c33 100644 --- a/lgsm/config-default/config-lgsm/dabserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dabserver/_default.cfg @@ -87,6 +87,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="317800" diff --git a/lgsm/config-default/config-lgsm/dmcserver/_default.cfg b/lgsm/config-default/config-lgsm/dmcserver/_default.cfg index 008ebfe60..be42fe649 100644 --- a/lgsm/config-default/config-lgsm/dmcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dmcserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/dodserver/_default.cfg b/lgsm/config-default/config-lgsm/dodserver/_default.cfg index 09eb2eb1d..586d825bd 100644 --- a/lgsm/config-default/config-lgsm/dodserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dodserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/dodsserver/_default.cfg b/lgsm/config-default/config-lgsm/dodsserver/_default.cfg index 5e9438356..6c747e26a 100644 --- a/lgsm/config-default/config-lgsm/dodsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dodsserver/_default.cfg @@ -87,6 +87,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="232290" diff --git a/lgsm/config-default/config-lgsm/doiserver/_default.cfg b/lgsm/config-default/config-lgsm/doiserver/_default.cfg index cb507f756..8f8ffad37 100644 --- a/lgsm/config-default/config-lgsm/doiserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/doiserver/_default.cfg @@ -89,6 +89,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="462310" diff --git a/lgsm/config-default/config-lgsm/dstserver/_default.cfg b/lgsm/config-default/config-lgsm/dstserver/_default.cfg index 645826951..2674c33f4 100644 --- a/lgsm/config-default/config-lgsm/dstserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dstserver/_default.cfg @@ -90,6 +90,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="343050" diff --git a/lgsm/config-default/config-lgsm/dysserver/_default.cfg b/lgsm/config-default/config-lgsm/dysserver/_default.cfg index 84342b6fa..822389fd3 100644 --- a/lgsm/config-default/config-lgsm/dysserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dysserver/_default.cfg @@ -92,6 +92,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="17585" diff --git a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg index 10908f448..c1936a028 100644 --- a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg @@ -75,6 +75,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="739590" diff --git a/lgsm/config-default/config-lgsm/emserver/_default.cfg b/lgsm/config-default/config-lgsm/emserver/_default.cfg index 3188dcf47..b2cd2b08a 100644 --- a/lgsm/config-default/config-lgsm/emserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/emserver/_default.cfg @@ -92,6 +92,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="460040" diff --git a/lgsm/config-default/config-lgsm/etlserver/_default.cfg b/lgsm/config-default/config-lgsm/etlserver/_default.cfg index 86e71c8bb..b2762dc16 100644 --- a/lgsm/config-default/config-lgsm/etlserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/etlserver/_default.cfg @@ -76,6 +76,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="ET: Legacy" diff --git a/lgsm/config-default/config-lgsm/fctrserver/_default.cfg b/lgsm/config-default/config-lgsm/fctrserver/_default.cfg index 4117dfbe5..bb6036d91 100644 --- a/lgsm/config-default/config-lgsm/fctrserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/fctrserver/_default.cfg @@ -87,6 +87,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Factorio" diff --git a/lgsm/config-default/config-lgsm/fofserver/_default.cfg b/lgsm/config-default/config-lgsm/fofserver/_default.cfg index 18d0081f0..45c9526ce 100644 --- a/lgsm/config-default/config-lgsm/fofserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/fofserver/_default.cfg @@ -87,6 +87,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="295230" diff --git a/lgsm/config-default/config-lgsm/gesserver/_default.cfg b/lgsm/config-default/config-lgsm/gesserver/_default.cfg index 6f810f409..7f1fc8fcb 100644 --- a/lgsm/config-default/config-lgsm/gesserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/gesserver/_default.cfg @@ -87,6 +87,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="310" # Source 2007 SDK diff --git a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg index 00732dd30..03990a8a2 100644 --- a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg @@ -103,6 +103,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="4020" diff --git a/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg b/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg index c5796eab5..974fb0478 100644 --- a/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg @@ -87,6 +87,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="232370" diff --git a/lgsm/config-default/config-lgsm/hldmserver/_default.cfg b/lgsm/config-default/config-lgsm/hldmserver/_default.cfg index 41308db1f..6a8dcc880 100644 --- a/lgsm/config-default/config-lgsm/hldmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hldmserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg b/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg index 91ae5546b..e31fee26d 100644 --- a/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg @@ -87,6 +87,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="255470" diff --git a/lgsm/config-default/config-lgsm/hwserver/_default.cfg b/lgsm/config-default/config-lgsm/hwserver/_default.cfg index 0be9eba7c..8272cca0b 100644 --- a/lgsm/config-default/config-lgsm/hwserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hwserver/_default.cfg @@ -98,6 +98,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="405100" diff --git a/lgsm/config-default/config-lgsm/insserver/_default.cfg b/lgsm/config-default/config-lgsm/insserver/_default.cfg index 7adb4b718..f7f047a10 100644 --- a/lgsm/config-default/config-lgsm/insserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/insserver/_default.cfg @@ -94,6 +94,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="237410" diff --git a/lgsm/config-default/config-lgsm/inssserver/_default.cfg b/lgsm/config-default/config-lgsm/inssserver/_default.cfg index 1ba1df679..1714219ec 100644 --- a/lgsm/config-default/config-lgsm/inssserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/inssserver/_default.cfg @@ -95,6 +95,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="581330" diff --git a/lgsm/config-default/config-lgsm/iosserver/_default.cfg b/lgsm/config-default/config-lgsm/iosserver/_default.cfg index f42987541..9d9d61c99 100644 --- a/lgsm/config-default/config-lgsm/iosserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/iosserver/_default.cfg @@ -87,6 +87,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="673990" diff --git a/lgsm/config-default/config-lgsm/jc2server/_default.cfg b/lgsm/config-default/config-lgsm/jc2server/_default.cfg index cb67c18d3..d539ee38c 100644 --- a/lgsm/config-default/config-lgsm/jc2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/jc2server/_default.cfg @@ -79,6 +79,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="261140" diff --git a/lgsm/config-default/config-lgsm/jc3server/_default.cfg b/lgsm/config-default/config-lgsm/jc3server/_default.cfg index ced884359..995fd4714 100644 --- a/lgsm/config-default/config-lgsm/jc3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/jc3server/_default.cfg @@ -79,6 +79,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="619960" diff --git a/lgsm/config-default/config-lgsm/kf2server/_default.cfg b/lgsm/config-default/config-lgsm/kf2server/_default.cfg index c6db77168..72c06d1b0 100644 --- a/lgsm/config-default/config-lgsm/kf2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/kf2server/_default.cfg @@ -85,6 +85,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="232130" diff --git a/lgsm/config-default/config-lgsm/kfserver/_default.cfg b/lgsm/config-default/config-lgsm/kfserver/_default.cfg index 25b828a1b..1644f73cc 100644 --- a/lgsm/config-default/config-lgsm/kfserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/kfserver/_default.cfg @@ -91,6 +91,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="215360" diff --git a/lgsm/config-default/config-lgsm/l4d2server/_default.cfg b/lgsm/config-default/config-lgsm/l4d2server/_default.cfg index 9bd1b8bac..c7205100c 100644 --- a/lgsm/config-default/config-lgsm/l4d2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/l4d2server/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="222860" diff --git a/lgsm/config-default/config-lgsm/l4dserver/_default.cfg b/lgsm/config-default/config-lgsm/l4dserver/_default.cfg index d4003b91e..33e562310 100644 --- a/lgsm/config-default/config-lgsm/l4dserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/l4dserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="222840" diff --git a/lgsm/config-default/config-lgsm/mcserver/_default.cfg b/lgsm/config-default/config-lgsm/mcserver/_default.cfg index 5d904a61b..4bfa870df 100644 --- a/lgsm/config-default/config-lgsm/mcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mcserver/_default.cfg @@ -81,6 +81,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Minecraft" diff --git a/lgsm/config-default/config-lgsm/mhserver/_default.cfg b/lgsm/config-default/config-lgsm/mhserver/_default.cfg index 4ae249588..2ad316151 100644 --- a/lgsm/config-default/config-lgsm/mhserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mhserver/_default.cfg @@ -87,6 +87,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="629800" diff --git a/lgsm/config-default/config-lgsm/mtaserver/_default.cfg b/lgsm/config-default/config-lgsm/mtaserver/_default.cfg index 459c2a45e..bc03ccf15 100644 --- a/lgsm/config-default/config-lgsm/mtaserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mtaserver/_default.cfg @@ -77,6 +77,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Multi Theft Auto" diff --git a/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg b/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg index c151ff914..d848af88f 100644 --- a/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg @@ -80,6 +80,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Mumble" diff --git a/lgsm/config-default/config-lgsm/ndserver/_default.cfg b/lgsm/config-default/config-lgsm/ndserver/_default.cfg index 192bac7e8..cf7712e3e 100644 --- a/lgsm/config-default/config-lgsm/ndserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ndserver/_default.cfg @@ -87,6 +87,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="111710" diff --git a/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg b/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg index 9de8fd81e..10d7696a6 100644 --- a/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg @@ -92,6 +92,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="317670" diff --git a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg index 7398c3cb9..f8de5a44c 100644 --- a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg @@ -94,6 +94,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="313900" diff --git a/lgsm/config-default/config-lgsm/ns2server/_default.cfg b/lgsm/config-default/config-lgsm/ns2server/_default.cfg index 3786e558c..2f7e602ca 100644 --- a/lgsm/config-default/config-lgsm/ns2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ns2server/_default.cfg @@ -98,6 +98,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="4940" diff --git a/lgsm/config-default/config-lgsm/nsserver/_default.cfg b/lgsm/config-default/config-lgsm/nsserver/_default.cfg index 25c22e9dd..1a5f8db9c 100644 --- a/lgsm/config-default/config-lgsm/nsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/nsserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/opforserver/_default.cfg b/lgsm/config-default/config-lgsm/opforserver/_default.cfg index b7f449e28..3618a40c1 100644 --- a/lgsm/config-default/config-lgsm/opforserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/opforserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/pcserver/_default.cfg b/lgsm/config-default/config-lgsm/pcserver/_default.cfg index 2dd4f0514..8b0f7ce78 100644 --- a/lgsm/config-default/config-lgsm/pcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pcserver/_default.cfg @@ -79,6 +79,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="332670" diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index b331cc134..3bb8dd0e4 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -90,6 +90,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="746200" diff --git a/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg b/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg index b75b07348..1a197d8f1 100644 --- a/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg @@ -87,6 +87,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="17575" diff --git a/lgsm/config-default/config-lgsm/pzserver/_default.cfg b/lgsm/config-default/config-lgsm/pzserver/_default.cfg index 179c7dd34..5aadad897 100644 --- a/lgsm/config-default/config-lgsm/pzserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pzserver/_default.cfg @@ -82,6 +82,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="380870" diff --git a/lgsm/config-default/config-lgsm/q2server/_default.cfg b/lgsm/config-default/config-lgsm/q2server/_default.cfg index 6eac2ebd8..c109e7bcf 100644 --- a/lgsm/config-default/config-lgsm/q2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/q2server/_default.cfg @@ -81,6 +81,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Quake 2" diff --git a/lgsm/config-default/config-lgsm/q3server/_default.cfg b/lgsm/config-default/config-lgsm/q3server/_default.cfg index fdbd4acec..89491a537 100644 --- a/lgsm/config-default/config-lgsm/q3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/q3server/_default.cfg @@ -81,6 +81,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Quake 3: Arena" diff --git a/lgsm/config-default/config-lgsm/qlserver/_default.cfg b/lgsm/config-default/config-lgsm/qlserver/_default.cfg index d77f20c5a..b4ac70336 100644 --- a/lgsm/config-default/config-lgsm/qlserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/qlserver/_default.cfg @@ -81,6 +81,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="349090" diff --git a/lgsm/config-default/config-lgsm/qwserver/_default.cfg b/lgsm/config-default/config-lgsm/qwserver/_default.cfg index 07ed79cf6..dad680aa8 100644 --- a/lgsm/config-default/config-lgsm/qwserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/qwserver/_default.cfg @@ -80,6 +80,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="QuakeWorld" diff --git a/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg b/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg index 51c34163b..1e4848403 100644 --- a/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/roserver/_default.cfg b/lgsm/config-default/config-lgsm/roserver/_default.cfg index 8ac336381..6402a7c51 100644 --- a/lgsm/config-default/config-lgsm/roserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/roserver/_default.cfg @@ -87,6 +87,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="223250" diff --git a/lgsm/config-default/config-lgsm/rtcwserver/_default.cfg b/lgsm/config-default/config-lgsm/rtcwserver/_default.cfg index a863c5425..2c753f26d 100644 --- a/lgsm/config-default/config-lgsm/rtcwserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/rtcwserver/_default.cfg @@ -81,6 +81,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Return to Castle Wolfenstein" diff --git a/lgsm/config-default/config-lgsm/rustserver/_default.cfg b/lgsm/config-default/config-lgsm/rustserver/_default.cfg index df590c2f3..b5e56db5b 100644 --- a/lgsm/config-default/config-lgsm/rustserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/rustserver/_default.cfg @@ -111,6 +111,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="258550" diff --git a/lgsm/config-default/config-lgsm/rwserver/_default.cfg b/lgsm/config-default/config-lgsm/rwserver/_default.cfg index ace8d23ae..56d6d4526 100644 --- a/lgsm/config-default/config-lgsm/rwserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/rwserver/_default.cfg @@ -82,6 +82,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="339010" diff --git a/lgsm/config-default/config-lgsm/sampserver/_default.cfg b/lgsm/config-default/config-lgsm/sampserver/_default.cfg index 5302a842b..40a49ae93 100644 --- a/lgsm/config-default/config-lgsm/sampserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sampserver/_default.cfg @@ -80,6 +80,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="San Andreas Multiplayer" diff --git a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg index 72e55c0a4..61ad1d74b 100644 --- a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg @@ -84,6 +84,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="974130" diff --git a/lgsm/config-default/config-lgsm/sbserver/_default.cfg b/lgsm/config-default/config-lgsm/sbserver/_default.cfg index 2d76ce0b3..8026983fe 100644 --- a/lgsm/config-default/config-lgsm/sbserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="211820" diff --git a/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg b/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg index 59a6d9eb7..b1d94ee0f 100644 --- a/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg @@ -82,6 +82,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="294420" diff --git a/lgsm/config-default/config-lgsm/squadserver/_default.cfg b/lgsm/config-default/config-lgsm/squadserver/_default.cfg index e947bb462..a4f2c704e 100644 --- a/lgsm/config-default/config-lgsm/squadserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/squadserver/_default.cfg @@ -84,6 +84,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="403240" diff --git a/lgsm/config-default/config-lgsm/ss3server/_default.cfg b/lgsm/config-default/config-lgsm/ss3server/_default.cfg index 563a93c4d..8a79c7954 100644 --- a/lgsm/config-default/config-lgsm/ss3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ss3server/_default.cfg @@ -83,6 +83,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="41080" diff --git a/lgsm/config-default/config-lgsm/stserver/_default.cfg b/lgsm/config-default/config-lgsm/stserver/_default.cfg index 1b4bef940..9492cb311 100644 --- a/lgsm/config-default/config-lgsm/stserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/stserver/_default.cfg @@ -89,6 +89,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="600760" diff --git a/lgsm/config-default/config-lgsm/svenserver/_default.cfg b/lgsm/config-default/config-lgsm/svenserver/_default.cfg index 34a1a70f0..dd434be27 100644 --- a/lgsm/config-default/config-lgsm/svenserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/svenserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="276060" diff --git a/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg b/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg index 9dc763f19..a099b3fb2 100644 --- a/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="105600" diff --git a/lgsm/config-default/config-lgsm/tf2server/_default.cfg b/lgsm/config-default/config-lgsm/tf2server/_default.cfg index 92eaa64b4..e0a429d99 100644 --- a/lgsm/config-default/config-lgsm/tf2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/tf2server/_default.cfg @@ -92,6 +92,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="232250" diff --git a/lgsm/config-default/config-lgsm/tfcserver/_default.cfg b/lgsm/config-default/config-lgsm/tfcserver/_default.cfg index d31998a0b..5f2184566 100644 --- a/lgsm/config-default/config-lgsm/tfcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/tfcserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/ts3server/_default.cfg b/lgsm/config-default/config-lgsm/ts3server/_default.cfg index f448c2f09..66787fc67 100644 --- a/lgsm/config-default/config-lgsm/ts3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ts3server/_default.cfg @@ -75,6 +75,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="TeamSpeak 3" diff --git a/lgsm/config-default/config-lgsm/tuserver/_default.cfg b/lgsm/config-default/config-lgsm/tuserver/_default.cfg index 91544d2f1..6764131da 100644 --- a/lgsm/config-default/config-lgsm/tuserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/tuserver/_default.cfg @@ -89,6 +89,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="439660" diff --git a/lgsm/config-default/config-lgsm/twserver/_default.cfg b/lgsm/config-default/config-lgsm/twserver/_default.cfg index b983e3b21..eee3683c5 100644 --- a/lgsm/config-default/config-lgsm/twserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/twserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="380840" diff --git a/lgsm/config-default/config-lgsm/untserver/_default.cfg b/lgsm/config-default/config-lgsm/untserver/_default.cfg index 26db0910b..b6cbf28a5 100644 --- a/lgsm/config-default/config-lgsm/untserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/untserver/_default.cfg @@ -93,6 +93,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="304930" diff --git a/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg b/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg index 5f32042df..8f5475533 100644 --- a/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg @@ -80,6 +80,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Unreal Tournament 2004" diff --git a/lgsm/config-default/config-lgsm/ut3server/_default.cfg b/lgsm/config-default/config-lgsm/ut3server/_default.cfg index 1716e3c0f..3c001c769 100644 --- a/lgsm/config-default/config-lgsm/ut3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut3server/_default.cfg @@ -91,6 +91,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Unreal Tournament 3" diff --git a/lgsm/config-default/config-lgsm/ut99server/_default.cfg b/lgsm/config-default/config-lgsm/ut99server/_default.cfg index 9942968d1..f69c5b7d3 100644 --- a/lgsm/config-default/config-lgsm/ut99server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut99server/_default.cfg @@ -80,6 +80,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Unreal Tournament 99" diff --git a/lgsm/config-default/config-lgsm/utserver/_default.cfg b/lgsm/config-default/config-lgsm/utserver/_default.cfg index 8f81eb7da..32ed512e4 100644 --- a/lgsm/config-default/config-lgsm/utserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/utserver/_default.cfg @@ -84,6 +84,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Unreal Tournament" diff --git a/lgsm/config-default/config-lgsm/vsserver/_default.cfg b/lgsm/config-default/config-lgsm/vsserver/_default.cfg index e6e85f0f9..ee0fcbbb4 100644 --- a/lgsm/config-default/config-lgsm/vsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/vsserver/_default.cfg @@ -86,6 +86,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/wetserver/_default.cfg b/lgsm/config-default/config-lgsm/wetserver/_default.cfg index 31daa3252..64032b699 100644 --- a/lgsm/config-default/config-lgsm/wetserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/wetserver/_default.cfg @@ -76,6 +76,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## LinuxGSM Server Details # Do not edit gamename="Wolfenstein: Enemy Territory" diff --git a/lgsm/config-default/config-lgsm/wurmserver/_default.cfg b/lgsm/config-default/config-lgsm/wurmserver/_default.cfg index c57f1f7c0..479c6eebc 100644 --- a/lgsm/config-default/config-lgsm/wurmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/wurmserver/_default.cfg @@ -78,6 +78,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="402370" diff --git a/lgsm/config-default/config-lgsm/zpsserver/_default.cfg b/lgsm/config-default/config-lgsm/zpsserver/_default.cfg index 9b9c38347..41f892663 100644 --- a/lgsm/config-default/config-lgsm/zpsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/zpsserver/_default.cfg @@ -92,6 +92,9 @@ logdays="7" # ANSI Colors ansi="on" +# Message Display Time +sleeptime="0.5" + ## SteamCMD Settings # Server appid appid="17505" diff --git a/lgsm/functions/alert_email.sh b/lgsm/functions/alert_email.sh index d3db30319..f1ceb73e5 100644 --- a/lgsm/functions/alert_email.sh +++ b/lgsm/functions/alert_email.sh @@ -9,7 +9,7 @@ local commandaction="Alert" local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_print_dots "Sending Email alert: ${email}" -sleep 0.5 +fn_sleep_time if [ -n "${emailfrom}" ]; then mail -s "${alertsubject}" -r "${emailfrom}" "${email}" < "${alertlog}" diff --git a/lgsm/functions/alert_ifttt.sh b/lgsm/functions/alert_ifttt.sh index 07c99dda6..261f3de62 100644 --- a/lgsm/functions/alert_ifttt.sh +++ b/lgsm/functions/alert_ifttt.sh @@ -18,7 +18,6 @@ EOF ) fn_print_dots "Sending IFTTT alert" -sleep 0.5 iftttsend=$(${curlpath} -sSL -H "Content-Type: application/json" -X POST -d """${json}""" "https://maker.ifttt.com/trigger/${iftttevent}/with/key/${ifttttoken}" | grep "Bad Request") if [ -n "${iftttsend}" ]; then @@ -27,4 +26,4 @@ if [ -n "${iftttsend}" ]; then else fn_print_ok_nl "Sending IFTTT alert" fn_script_log_pass "Sent IFTTT alert" -fi \ No newline at end of file +fi diff --git a/lgsm/functions/alert_mailgun.sh b/lgsm/functions/alert_mailgun.sh index d42aaddab..8b32b73a8 100644 --- a/lgsm/functions/alert_mailgun.sh +++ b/lgsm/functions/alert_mailgun.sh @@ -9,7 +9,6 @@ local commandaction="Alert" local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_print_dots "Sending Email alert: Mailgun: ${email}" -sleep 0.5 mailgunsend=$(${curlpath} -s --user "api:${mailguntoken}" \ -F from="LinuxGSM <${mailgunemailfrom}>" \ @@ -25,4 +24,4 @@ if [ -z "${mailgunsend}" ]; then else fn_print_ok_nl "Sending Email alert: Mailgun: ${email}" fn_script_log_pass "Sending Email alert: Mailgun: ${email}" -fi \ No newline at end of file +fi diff --git a/lgsm/functions/alert_pushbullet.sh b/lgsm/functions/alert_pushbullet.sh index aebef54ab..72995a70f 100644 --- a/lgsm/functions/alert_pushbullet.sh +++ b/lgsm/functions/alert_pushbullet.sh @@ -19,7 +19,6 @@ EOF ) fn_print_dots "Sending Pushbullet alert" -sleep 0.5 pushbulletsend=$(${curlpath} -sSL -u """${pushbullettoken}"":" -H "Content-Type: application/json" -X POST -d """${json}""" "https://api.pushbullet.com/v2/pushes" | grep "error_code") if [ -n "${pushbulletsend}" ]; then diff --git a/lgsm/functions/alert_pushover.sh b/lgsm/functions/alert_pushover.sh index d25e598c6..352737261 100644 --- a/lgsm/functions/alert_pushover.sh +++ b/lgsm/functions/alert_pushover.sh @@ -9,7 +9,6 @@ local commandaction="Alert" local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_print_dots "Sending Pushover alert" -sleep 0.5 # Different alerts are given different priorities and notification sounds if [ "${alertsound}" == "1" ]; then @@ -32,4 +31,4 @@ if [ -n "${pushoversend}" ]; then else fn_print_ok_nl "Sending Pushover alert" fn_script_log_pass "Sent Pushover alert" -fi \ No newline at end of file +fi diff --git a/lgsm/functions/alert_telegram.sh b/lgsm/functions/alert_telegram.sh index 647ea7008..331c0a6de 100644 --- a/lgsm/functions/alert_telegram.sh +++ b/lgsm/functions/alert_telegram.sh @@ -18,7 +18,6 @@ EOF ) fn_print_dots "Sending Telegram alert" -sleep 0.5 telegramsend=$(${curlpath} -sSL -H "Content-Type: application/json" -X POST -d """${json}""" "https://api.telegram.org/bot${telegramtoken}/sendMessage" ${curlcustomstring} | grep "error_code") if [ -n "${telegramsend}" ]; then diff --git a/lgsm/functions/check_config.sh b/lgsm/functions/check_config.sh index dff515742..2f507808b 100644 --- a/lgsm/functions/check_config.sh +++ b/lgsm/functions/check_config.sh @@ -10,12 +10,10 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" if [ ! -e "${servercfgfullpath}" ]; then if [ "${shortname}" != "hw" ]&&[ "${shortname}" != "ut3" ]&&[ "${shortname}" != "kf2" ]; then fn_print_dots "" - sleep 0.5 fn_print_warn_nl "Configuration file missing!" echo "${servercfgfullpath}" fn_script_log_warn "Configuration file missing!" fn_script_log_warn "${servercfgfullpath}" - sleep 1 install_config.sh fi fi @@ -23,7 +21,6 @@ fi if [ "${shortname}" == "rust" ]; then if [ -z "${rconpassword}" ]; then fn_print_dots "" - sleep 0.5 fn_print_fail_nl "RCON password is not set!" echo " * Not setting an RCON password causes issues with ${gamename}" fn_script_log_fatal "RCON password is not set" @@ -31,10 +28,8 @@ if [ "${shortname}" == "rust" ]; then core_exit.sh elif [ "${rconpassword}" == "CHANGE_ME" ]; then fn_print_dots "" - sleep 0.5 fn_print_warn_nl "Default RCON Password detected!" echo " * Having ${rconpassword} as a password is not very safe." fn_script_log_warn "Default RCON Password detected" - sleep 2 fi fi diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 351c848d3..d69926f8f 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -9,7 +9,6 @@ local commandname="CHECK" fn_install_mono_repo(){ if [ "${monostatus}" != "0" ]; then fn_print_dots "Adding Mono repository" - sleep 0.5 if [ "${autoinstall}" == "1" ]; then sudo -n true > /dev/null 2>&1 else @@ -107,7 +106,6 @@ fn_install_universe_repo(){ if [ "${jquniversemissing}" != "0" ]&&[ "${distroid}" == "ubuntu" ]; then fn_print_warning_nl "Ubuntu 18.04.1 contains a bug which means the sources.list file does not populate with the Ubuntu universe repository." fn_print_information_nl "Attempting to add Universe Repo" - sleep 0.5 if [ "${autoinstall}" == "1" ]; then sudo -n true > /dev/null 2>&1 else @@ -180,14 +178,14 @@ fn_deps_detector(){ missingdep=0 if [ "${function_selfname}" == "command_install.sh" ]; then echo -e "${green}${deptocheck}${default}" - sleep 0.2 + fn_sleep_time fi else # if dependency is not found missingdep=1 if [ "${function_selfname}" == "command_install.sh" ]; then echo -e "${red}${deptocheck}${default}" - sleep 0.2 + fn_sleep_time fi # Define required dependencies for SteamCMD if [ -n "${appid}" ]; then @@ -231,7 +229,7 @@ fn_found_missing_deps(){ fn_print_warning_nl "Missing dependencies: ${red}${array_deps_missing[@]}${default}" fn_script_log_warn "Missing dependencies: ${array_deps_missing[@]}" - sleep 0.5 + fn_sleep_time if [ -n "${monostatus}" ]; then fn_install_mono_repo fi @@ -553,7 +551,7 @@ if [ "${function_selfname}" == "command_install.sh" ]; then echo "=================================" fn_print_information_nl "Checking any missing dependencies for ${gamename} server only." fn_print_information_nl "This will NOT install a ${gamename} server." - sleep 2 + fn_sleep_time else echo "" echo "Checking Dependencies" diff --git a/lgsm/functions/check_glibc.sh b/lgsm/functions/check_glibc.sh index d353ed8af..7abf46dd1 100644 --- a/lgsm/functions/check_glibc.sh +++ b/lgsm/functions/check_glibc.sh @@ -13,12 +13,10 @@ if [ "${glibcrequired}" == "NOT REQUIRED" ]; then : elif [ "$(printf '%s\n'${glibcrequired}'\n' "${glibcversion}" | sort -V | head -n 1)" != "${glibcrequired}" ]||[ "${glibcrequired}" == "UNKNOWN" ]; then fn_print_dots "Glibc" - sleep 0.5 fn_print_error_nl "glibc: ${red}glibc distro version ${glibcversion} too old${default}" echo -en "\n" echo -e " * glibc required: ${glibcrequired}" echo -e " * glibc installed: ${red}${glibcversion}${default}" echo -en "\n" fn_print_information "The game server will probably not work. A distro upgrade is required!" - sleep 2 -fi \ No newline at end of file +fi diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh index ba0fd6ece..d9390ac0e 100644 --- a/lgsm/functions/check_ip.sh +++ b/lgsm/functions/check_ip.sh @@ -21,7 +21,6 @@ if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "mumble" ]&&[ "${travistest} # IP is not set to specific IP if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then fn_print_dots "Check IP" - sleep 0.2 # Multiple interfaces if [ "${getipwc}" -ge "2" ]; then if [ "${function_selfname}" == "command_details.sh" ]; then @@ -29,7 +28,6 @@ if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "mumble" ]&&[ "${travistest} else fn_print_fail "Check IP: Multiple IP addresses found." fi - sleep 0.2 echo -en "\n" # IP is set within game config if [ "${ipsetinconfig}" == "1" ]; then @@ -66,7 +64,6 @@ if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "mumble" ]&&[ "${travistest} # Single interface elif [ "${ipsetinconfig}" == "1" ]; then fn_print_fail "Check IP: IP address not set in game config." - sleep 0.5 echo -en "\n" fn_print_information "Specify the IP you want to bind within ${servercfg}.\n" echo -en " * location: ${servercfgfullpath}\n" @@ -85,7 +82,6 @@ if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "mumble" ]&&[ "${travistest} else fn_print_info_nl "Check IP: ${getip}" fn_script_log_info "IP automatically set as: ${getip}" - sleep 0.2 ip="${getip}" fi fi diff --git a/lgsm/functions/check_logs.sh b/lgsm/functions/check_logs.sh index 717e53ada..1a71f3dfd 100644 --- a/lgsm/functions/check_logs.sh +++ b/lgsm/functions/check_logs.sh @@ -9,7 +9,6 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_check_logs(){ fn_print_dots "Checking for log files" - sleep 0.5 fn_print_info_nl "Checking for log files: Creating log files" checklogs=1 install_logs.sh diff --git a/lgsm/functions/check_permissions.sh b/lgsm/functions/check_permissions.sh index f1bca798d..e1c0cabd7 100644 --- a/lgsm/functions/check_permissions.sh +++ b/lgsm/functions/check_permissions.sh @@ -171,7 +171,7 @@ fn_sys_perm_fix_manually_msg(){ fn_script_log_info "To fix this issue, run the following command as root:" echo " chmod a+rx /sys /sys/class /sys/class/net" fn_script_log "chmod a+rx /sys /sys/class /sys/class/net" - sleep 0.5 + fn_sleep_time if [ "${monitorflag}" == 1 ]; then alert="permissions" alert.sh @@ -184,7 +184,6 @@ fn_sys_perm_errors_fix(){ sudo -n true > /dev/null 2>&1 if [ $? -eq 0 ]; then fn_print_dots "Automatically fixing /sys permissions" - sleep 0.5 fn_script_log_info "Automatically fixing /sys permissions." if [ "${sysdirpermerror}" == "1" ]; then sudo chmod a+rx "/sys" @@ -200,13 +199,12 @@ fn_sys_perm_errors_fix(){ if [ "${sysdirpermerror}" == "1" ]||[ "${classdirpermerror}" == "1" ]||[ "${netdirpermerror}" == "1" ]; then fn_print_error "Could not fix /sys permissions" fn_script_log_error "Could not fix /sys permissions." - sleep 0.5 + fn_sleep_time # Show the user how to fix fn_sys_perm_fix_manually_msg else fn_print_ok_nl "Automatically fixing /sys permissions" fn_script_log_pass "Permissions in /sys fixed" - sleep 0.5 fi else # Show the user how to fix @@ -221,7 +219,6 @@ fn_sys_perm_error_process(){ if [ "${sysdirpermerror}" == "1" ]||[ "${classdirpermerror}" == "1" ]||[ "${netdirpermerror}" == "1" ]; then fn_print_error_nl "Permission error(s) found in /sys" fn_script_log_error "Permission error(s) found in /sys" - sleep 0.5 # Run the fix fn_sys_perm_errors_fix fi diff --git a/lgsm/functions/check_steamcmd.sh b/lgsm/functions/check_steamcmd.sh index f47abf359..518696e0e 100644 --- a/lgsm/functions/check_steamcmd.sh +++ b/lgsm/functions/check_steamcmd.sh @@ -52,7 +52,6 @@ fn_check_steamcmd_sh(){ else fn_print_error_nl "SteamCMD is missing" fn_script_log_error "SteamCMD is missing" - sleep 0.5 fn_install_steamcmd fi elif [ "${function_selfname}" == "command_install.sh" ]; then diff --git a/lgsm/functions/check_system_requirements.sh b/lgsm/functions/check_system_requirements.sh index 96a73f8e6..d0cf9bf8d 100644 --- a/lgsm/functions/check_system_requirements.sh +++ b/lgsm/functions/check_system_requirements.sh @@ -42,11 +42,9 @@ fi if [ -n "${ramrequirementmb}" ]; then if [ "${physmemtotalmb}" -lt "${ramrequirementmb}" ]; then fn_print_dots "Check RAM" - sleep 0.5 # Warn the user fn_print_warn_nl "Check RAM: ${ramrequirementgb}G required, ${physmemtotal} available" - sleep 0.5 echo " * ${gamename} server may fail to run or experience poor performance." - sleep 0.5 + fn_sleep_time fi fi diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index c5d48e202..c5530440d 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -17,7 +17,6 @@ fn_backup_trap(){ echo -en "backup ${backupname}.tar.gz..." fn_print_canceled_eol_nl fn_script_log_info "Backup ${backupname}.tar.gz: CANCELED" - sleep 0.5 rm -f "${backupdir}/${backupname}.tar.gz" | tee -a "${lgsmlog}" echo -en "backup ${backupname}.tar.gz..." fn_print_removed_eol_nl @@ -44,10 +43,7 @@ fn_backup_init(){ info_distro.sh fn_print_dots "Backup starting" fn_script_log_info "Backup starting" - sleep 0.5 - fn_print_ok "Backup starting" - sleep 0.5 - echo -en "\n" + fn_print_ok_nl "Backup starting" if [ ! -d "${backupdir}" ]||[ "${backupcount}" == "0" ]; then fn_print_info_nl "There are no previous backups" else @@ -59,7 +55,6 @@ fn_backup_init(){ daysago="${lastbackupdaysago} days ago" fi echo " * Previous backup was created ${daysago}, total size ${lastbackupsize}" - sleep 0.5 fi } @@ -80,7 +75,6 @@ fn_backup_stop_server(){ else fn_print_warn_nl "${servicename} will be stopped during the backup" fn_script_log_warn "${servicename} will be stopped during the backup" - sleep 5 serverstopped="yes" exitbypass=1 command_stop.sh @@ -109,7 +103,6 @@ fn_backup_compression(){ # Tells how much will be compressed using rootdirduexbackup value from info_distro and prompt for continue fn_print_info "A total of ${rootdirduexbackup} will be compressed." fn_script_log_info "A total of ${rootdirduexbackup} will be compressed: ${backupdir}/${backupname}.tar.gz" - sleep 2 fn_print_dots "Backup (${rootdirduexbackup}) ${backupname}.tar.gz, in progress..." fn_script_log_info "backup ${rootdirduexbackup} ${backupname}.tar.gz, in progress" excludedir=$(fn_backup_relpath) @@ -131,7 +124,6 @@ fn_backup_compression(){ fn_script_log_fatal "Starting backup" else fn_print_ok_eol - sleep 0.5 fn_print_ok_nl "Completed: ${backupname}.tar.gz, total size $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}')" fn_script_log_pass "Backup created: ${backupname}.tar.gz, total size $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}')" fi @@ -153,18 +145,15 @@ fn_backup_prune(){ if [ "${backupquotadiff}" -gt "0" ]||[ "${backupsoudatedcount}" -gt "0" ]; then fn_print_dots "Pruning" fn_script_log_info "Backup pruning activated" - sleep 0.5 fn_print_ok_nl "Pruning" - sleep 0.5 # If maxbackups greater or equal to backupsoutdatedcount, then it is over maxbackupdays if [ "${backupquotadiff}" -ge "${backupsoudatedcount}" ]; then # Display how many backups will be cleared echo " * Pruning: ${backupquotadiff} backup(s) has exceeded the ${maxbackups} backups limit" fn_script_log_info "Pruning: ${backupquotadiff} backup(s) has exceeded the ${maxbackups} backups limit" - sleep 0.5 + fn_sleep_time fn_print_dots "Pruning: Clearing ${backupquotadiff} backup(s)" fn_script_log_info "Pruning: Clearing ${backupquotadiff} backup(s)" - sleep 0.5 # Clear backups over quota find "${backupdir}"/ -type f -name "*.tar.gz" -printf '%T@ %p\n' | sort -rn | tail -${backupquotadiff} | cut -f2- -d" " | xargs rm fn_print_ok_nl "Pruning: Clearing ${backupquotadiff} backup(s)" @@ -174,16 +163,14 @@ fn_backup_prune(){ # Display how many backups will be cleared echo " * Pruning: ${backupsoudatedcount} backup(s) are older than ${maxbackupdays} days." fn_script_log_info "Pruning: ${backupsoudatedcount} backup(s) older than ${maxbackupdays} days." - sleep 0.5 + fn_sleep_time fn_print_dots "Pruning: Clearing ${backupquotadiff} backup(s)." fn_script_log_info "Pruning: Clearing ${backupquotadiff} backup(s)" - sleep 0.5 # Clear backups over quota find "${backupdir}"/ -type f -mtime +"${maxbackupdays}" -exec rm -f {} \; fn_print_ok_nl "Pruning: Clearing ${backupquotadiff} backup(s)" fn_script_log_pass "Pruning: Cleared ${backupquotadiff} backup(s)" fi - sleep 0.5 fi fi } diff --git a/lgsm/functions/command_console.sh b/lgsm/functions/command_console.sh index 8daf02105..26f0a4707 100644 --- a/lgsm/functions/command_console.sh +++ b/lgsm/functions/command_console.sh @@ -22,19 +22,16 @@ if ! fn_prompt_yn "Continue?" Y; then echo Exiting; return fi fn_print_dots "Accessing console" -sleep 0.5 check_status.sh if [ "${status}" != "0" ]; then fn_print_ok_nl "Accessing console" fn_script_log_pass "Console accessed" - sleep 0.5 tmux attach-session -t "${servicename}" fn_print_ok_nl "Closing console" fn_script_log_pass "Console closed" else fn_print_error_nl "Server not running" fn_script_log_error "Failed to access: Server not running" - sleep 0.5 if fn_prompt_yn "Do you want to start the server?" Y; then exitbypass=1 command_start.sh diff --git a/lgsm/functions/command_debug.sh b/lgsm/functions/command_debug.sh index 7664ff8be..1ae89fb94 100644 --- a/lgsm/functions/command_debug.sh +++ b/lgsm/functions/command_debug.sh @@ -80,12 +80,10 @@ fi fn_print_info_nl "Stopping any running servers" fn_script_log_info "Stopping any running servers" -sleep 0.5 exitbypass=1 command_stop.sh fn_print_dots "Starting debug" fn_script_log_info "Starting debug" -sleep 0.5 fn_print_ok_nl "Starting debug" # Create lockfile @@ -111,7 +109,6 @@ else fi fn_print_dots "Stopping debug" -sleep 1 fn_print_ok_nl "Stopping debug" # remove trap. trap - INT diff --git a/lgsm/functions/command_fastdl.sh b/lgsm/functions/command_fastdl.sh index 3c0d6b356..f686e6126 100644 --- a/lgsm/functions/command_fastdl.sh +++ b/lgsm/functions/command_fastdl.sh @@ -77,7 +77,7 @@ fn_clear_old_fastdl(){ fn_print_ok_eol_nl fn_script_log_pass "Clearing existing FastDL directory ${fastdldir}" fi - sleep 0.5 + fn_sleep_time fi } @@ -95,7 +95,7 @@ fn_fastdl_dirs(){ fn_print_ok_eol_nl fn_script_log_pass "Creating web directory ${webdir}" fi - sleep 0.5 + fn_sleep_time fi if [ ! -d "${fastdldir}" ]; then echo -en "creating fastdl directory ${fastdldir}..." @@ -109,7 +109,7 @@ fn_fastdl_dirs(){ fn_print_ok_eol_nl fn_script_log_pass "Creating fastdl directory ${fastdldir}" fi - sleep 0.5 + fn_sleep_time fi } @@ -204,7 +204,7 @@ fn_fastdl_preview(){ fi if [ -f "${tmpdir}/fastdl_files_to_compress.txt" ]; then echo "calculating total file size..." - sleep 0.5 + fn_sleep_time totalfiles=$(wc -l < "${tmpdir}/fastdl_files_to_compress.txt") # Calculates total file size while read -r dufile; do @@ -271,7 +271,7 @@ fn_fastdl_gmod(){ fi # Clear addons directory in fastdl echo -en "clearing addons dir from fastdl dir..." - sleep 0.5 + fn_sleep_time rm -R "${fastdldir:?}/addons" exitcode=$? if [ ${exitcode} -ne 0 ]; then @@ -286,7 +286,7 @@ fn_fastdl_gmod(){ # Correct content that may be into a lua directory by mistake like some darkrpmodification addons if [ -d "${fastdldir}/lua" ]; then echo -en "correcting DarkRP files..." - sleep 1 + fn_sleep_time cp -Rf "${fastdldir}/lua/"* "${fastdldir}" exitcode=$? if [ ${exitcode} -ne 0 ]; then @@ -331,7 +331,7 @@ fn_fastdl_source(){ ((fileswc++)) tput rc; tput el printf "copying ${directory} ${allowed_extention} : ${fileswc}..." - sleep 0.01 + fn_sleep_time if [ ! -d "${fastdldir}/${directory}" ]; then mkdir "${fastdldir}/${directory}" fi diff --git a/lgsm/functions/command_mods_install.sh b/lgsm/functions/command_mods_install.sh index b26bb9e06..38bc4979a 100644 --- a/lgsm/functions/command_mods_install.sh +++ b/lgsm/functions/command_mods_install.sh @@ -85,7 +85,6 @@ if [ -f "${modsinstalledlistfullpath}" ]; then if [ -n "$(sed -n "/^${modcommand}$/p" "${modsinstalledlistfullpath}")" ]; then fn_print_warning_nl "${modprettyname} is already installed" fn_script_log_warn "${modprettyname} is already installed" - sleep 0.5 echo " * Any configs may be overwritten." if ! fn_prompt_yn "Continue?" Y; then echo Exiting; core_exit.sh diff --git a/lgsm/functions/command_mods_remove.sh b/lgsm/functions/command_mods_remove.sh index 7a0eb7dd2..344f9e2a9 100644 --- a/lgsm/functions/command_mods_remove.sh +++ b/lgsm/functions/command_mods_remove.sh @@ -58,7 +58,7 @@ fn_script_log_info "Removing ${modsfilelistsize} files from ${modprettyname}" echo -e "removing ${modprettyname}" echo -e "* ${modsfilelistsize} files to be removed" echo -e "* location: ${modinstalldir}" -sleep 0.5 +fn_sleep_time # Go through every file and remove it modfileline="1" tput sc @@ -87,10 +87,10 @@ if [ ${exitcode} -ne 0 ]; then else fn_print_ok_eol_nl fi -sleep 0.5 +fn_sleep_time # Remove file list echo -en "removing ${modcommand}-files.txt..." -sleep 0.5 +fn_sleep_time rm -rf "${modsdir}/${modcommand}-files.txt" local exitcode=$? if [ ${exitcode} -ne 0 ]; then @@ -104,7 +104,7 @@ fi # Remove mods from installed mods list echo -en "removing ${modcommand} from ${modsinstalledlist}..." -sleep 0.5 +fn_sleep_time sed -i "/^${modcommand}$/d" "${modsinstalledlistfullpath}" local exitcode=$? diff --git a/lgsm/functions/command_mods_update.sh b/lgsm/functions/command_mods_update.sh index b80e4416e..43eb1cb80 100644 --- a/lgsm/functions/command_mods_update.sh +++ b/lgsm/functions/command_mods_update.sh @@ -17,7 +17,7 @@ mods_core.sh fn_remove_cfg_files(){ if [ "${modkeepfiles}" != "OVERWRITE" ]&&[ "${modkeepfiles}" != "NOUPDATE" ]; then echo -e "the following files/directories will be preserved:" - sleep 0.5 + fn_sleep_time # Count how many files there are to remove filestopreserve="$(echo "${modkeepfiles}" | awk -F ';' '{ print NF }')" # Test all subvalues of "modkeepfiles" using the ";" separator @@ -39,7 +39,6 @@ fn_remove_cfg_files(){ } fn_print_dots "Update addons/mods" -sleep 0.5 fn_mods_check_installed fn_print_info_nl "Update addons/mods: ${installedmodscount} addons/mods will be updated" fn_script_log_info "${installedmodscount} mods or addons will be updated" @@ -66,7 +65,6 @@ for ((ulindex=0; ulindex < ${#installedmodslist[@]}; ulindex++)); do echo -e " * ${yellow}${modprettyname}${default} (retain common custom files)" fi done -sleep 0.5 ## Update # List all installed mods and apply update diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh index 491015bcc..9760380de 100644 --- a/lgsm/functions/command_monitor.sh +++ b/lgsm/functions/command_monitor.sh @@ -18,7 +18,6 @@ for queryattempt in {1..5}; do fn_print_dots "Querying port: ${querymethod}: ${ip}:${queryport} : ${totalseconds}/${queryattempt}: " fn_print_querying_eol fn_script_log_info "Querying port: ${querymethod}: ${ip}:${queryport} : ${queryattempt} : QUERYING" - sleep 0.5 if [ "${querymethod}" == "gamedig" ]; then query_gamedig.sh elif [ "${querymethod}" == "gsquery" ]; then @@ -37,7 +36,6 @@ for queryattempt in {1..5}; do if [ "${querystatus}" == "0" ]; then # Server query OK. - sleep 0.5 fn_print_ok "Querying port: ${querymethod}: ${ip}:${queryport} : ${totalseconds}/${queryattempt}: " fn_print_ok_eol_nl fn_script_log_pass "Querying port: ${querymethod}: ${ip}:${queryport} : ${queryattempt}: OK" @@ -48,7 +46,6 @@ for queryattempt in {1..5}; do fn_script_log_info "Querying port: ${querymethod}: ${ip}:${queryport} : ${queryattempt}: FAIL" fn_print_fail "Querying port: ${querymethod}: ${ip}:${queryport} : ${totalseconds}/${queryattempt}: " fn_print_fail_eol - sleep 0.5 # Monitor try gamedig first then gsquery before restarting. if [ "${querymethod}" == "gsquery" ]; then if [ "${totalseconds}" -ge "59" ]; then @@ -56,7 +53,6 @@ for queryattempt in {1..5}; do fn_print_fail "Querying port: ${querymethod}: ${ip}:${queryport} : ${totalseconds}/${queryattempt}: " fn_print_fail_eol_nl fn_script_log_error "Querying port: ${querymethod}: ${ip}:${queryport} : ${queryattempt}: FAIL" - sleep 0.5 # Send alert if enabled. alert="restartquery" @@ -74,7 +70,6 @@ for queryattempt in {1..5}; do for seconds in {1..15}; do fn_print_fail "Querying port: ${querymethod}: ${ip}:${queryport} : ${totalseconds}/${queryattempt}: WAIT" totalseconds=$((totalseconds + 1)) - sleep 1 if [ "${seconds}" == "15" ]; then break fi @@ -98,7 +93,6 @@ fn_monitor_check_update(){ if [ "$(ps -ef | grep "${selfname} update" | grep -v grep | wc -l)" != "0" ]; then fn_print_error_nl "SteamCMD is currently checking for updates" fn_script_log_error "SteamCMD is currently checking for updates" - sleep 0.5 core_exit.sh fi } @@ -107,7 +101,6 @@ fn_monitor_check_session(){ fn_print_dots "Checking session: " fn_print_checking_eol fn_script_log_info "Checking session: CHECKING" - sleep 0.5 if [ "${status}" != "0" ]; then fn_print_ok "Checking session: " fn_print_ok_eol_nl @@ -125,11 +118,9 @@ fn_monitor_check_session(){ alert="restart" alert.sh fn_script_log_info "Monitor is starting ${servername}" - sleep 0.5 command_restart.sh core_exit.sh fi - sleep 0.5 } fn_monitor_query(){ @@ -185,7 +176,6 @@ fn_monitor_query_upd(){ monitorflag=1 fn_print_dots "${servername}" -sleep 0.5 check.sh logs.sh info_config.sh diff --git a/lgsm/functions/command_postdetails.sh b/lgsm/functions/command_postdetails.sh index 660bb326f..4b34c9f39 100644 --- a/lgsm/functions/command_postdetails.sh +++ b/lgsm/functions/command_postdetails.sh @@ -80,7 +80,6 @@ fi if [ "${posttarget}" == "http://pastebin.com" ] ; then fn_print_dots "Posting details to pastbin.com for ${postexpire}" - sleep 0.5 # grab the return from 'value' from an initial visit to pastebin. csrftoken=$(${curlpath} -s "${posttarget}" | sed -n 's/^.*input type="hidden" name="csrf_token_post" value="\(.*\)".*$/\1/p') @@ -100,7 +99,6 @@ if [ "${posttarget}" == "http://pastebin.com" ] ; then echo " Please share the following url for support: ${pdurl}" elif [ "${posttarget}" == "https://hastebin.com" ] ; then fn_print_dots "Posting details to hastebin.com" - sleep 0.5 # hastebin is a bit simpler. If successful, the returned result # should look like: {"something":"key"}, putting the reference that # we need in "key". TODO - error handling. -CedarLUG @@ -117,4 +115,4 @@ if [ -z "${alertflag}" ]; then core_exit.sh else alerturl="${pdurl}" -fi \ No newline at end of file +fi diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh index d61907ee0..1ab7b4403 100644 --- a/lgsm/functions/command_start.sh +++ b/lgsm/functions/command_start.sh @@ -15,16 +15,16 @@ fn_start_teamspeak3(){ fn_script_log_warn "${servercfgfullpath} is missing" echo " * Creating blank ${servercfg}" fn_script_log_info "Creating blank ${servercfg}" - sleep 1 + fn_sleep_time echo " * ${servercfg} can remain blank by default." fn_script_log_info "${servercfgfullpath} can remain blank by default." - sleep 1 + fn_sleep_time echo " * ${servercfg} is located in ${servercfgfullpath}." fn_script_log_info "${servercfg} is located in ${servercfgfullpath}." sleep 5 touch "${servercfgfullpath}" fi - sleep 0.5 + fn_sleep_time if [ -f "${lgsmlog}" ]; then mv "${lgsmlog}" "${lgsmlogdate}" fi @@ -40,7 +40,7 @@ fn_start_teamspeak3(){ else ./ts3server_startscript.sh start inifile="${servercfgfullpath}" > /dev/null 2>&1 fi - sleep 0.5 + fn_sleep_time check_status.sh if [ "${status}" == "0" ]; then fn_print_fail_nl "Unable to start ${servername}" @@ -128,14 +128,13 @@ if [ "${consolelogging}" == "off" ]; then echo "Console logging disabled by user" >> "${consolelog}" fn_script_log_info "Console logging disabled by user" fi -sleep 0.5 +fn_sleep_time # If the server fails to start check_status.sh if [ "${status}" == "0" ]; then fn_print_fail_nl "Unable to start ${servername}" fn_script_log_fatal "Unable to start ${servername}" - sleep 0.5 if [ -s "${lgsmlogdir}/.${servicename}-tmux-error.tmp" ]; then fn_print_fail_nl "Unable to start ${servername}: Tmux error:" fn_script_log_fatal "Unable to start ${servername}: Tmux error:" @@ -187,7 +186,6 @@ sleep 0.5 } fn_print_dots "${servername}" -sleep 0.5 check.sh # Is the server already started if [ "${status}" != "0" ]; then # $status comes from check_status.sh, which is run by check.sh for this command diff --git a/lgsm/functions/command_stop.sh b/lgsm/functions/command_stop.sh index fc43476e6..9aadfbe54 100644 --- a/lgsm/functions/command_stop.sh +++ b/lgsm/functions/command_stop.sh @@ -33,7 +33,7 @@ fn_stop_graceful_ctrlc(){ fn_print_fail_eol_nl fn_script_log_error "Graceful: CTRL+c: FAIL" fi - sleep 0.5 + fn_sleep_time } # Attempts graceful shutdown by sending a specified command. @@ -62,7 +62,7 @@ fn_stop_graceful_cmd(){ fn_print_fail_eol_nl fn_script_log_error "Graceful: sending \"${1}\": FAIL" fi - sleep 0.5 + fn_sleep_time } # Attempts graceful of goldsource using rcon 'quit' command. @@ -82,7 +82,6 @@ fn_stop_graceful_goldsource(){ fn_print_ok "Graceful: sending \"quit\": ${seconds}: " fn_print_ok_eol_nl fn_script_log_pass "Graceful: sending \"quit\": OK: ${seconds} seconds" - sleep 0.5 } # Attempts graceful of 7 Days To Die using telnet. @@ -119,13 +118,12 @@ fn_stop_telnet_sdtd(){ expect { eof } puts "Completed.\n" ') - fi + fi } fn_stop_graceful_sdtd(){ fn_print_dots "Graceful: telnet" fn_script_log_info "Graceful: telnet" - sleep 0.5 if [ "${telnetenabled}" == "false" ]; then fn_print_info_nl "Graceful: telnet: DISABLED: Enable in ${servercfg}" elif [ "$(command -v expect 2>/dev/null)" ]; then @@ -133,7 +131,6 @@ fn_stop_graceful_sdtd(){ for telnetip in 127.0.0.1 ${ip}; do fn_print_dots "Graceful: telnet: ${telnetip}:${telnetport}" fn_script_log_info "Graceful: telnet: ${telnetip}:${telnetport}" - sleep 0.5 fn_stop_telnet_sdtd completed=$(echo -en "\n ${sdtd_telnet_shutdown}" | grep "Completed.") refused=$(echo -en "\n ${sdtd_telnet_shutdown}" | grep "Timeout or EOF") @@ -141,7 +138,6 @@ fn_stop_graceful_sdtd(){ fn_print_error "Graceful: telnet: ${telnetip}:${telnetport} : " fn_print_fail_eol_nl fn_script_log_error "Graceful: telnet: ${telnetip}:${telnetport} : FAIL" - sleep 1 elif [ -n "${completed}" ]; then break fi @@ -183,7 +179,7 @@ fn_stop_graceful_sdtd(){ fn_print_fail_eol_nl fn_script_log_warn "Graceful: telnet: expect not installed: FAIL" fi - sleep 0.5 + fn_sleep_time } fn_stop_graceful_select(){ @@ -233,7 +229,6 @@ fn_stop_ark(){ # and a valid numeric pid remains unchanged. if [ "${pid}" -gt 1 ]&&[ "${pid}" -le "$(cat "/proc/sys/kernel/pid_max")" ]; then fn_print_dots "Process still bound. Awaiting graceful exit: ${pidcheck}" - sleep 0.5 else break # Our job is done here fi # end if for pid range check @@ -249,7 +244,6 @@ fn_stop_ark(){ fn_stop_teamspeak3(){ fn_print_dots "${servername}" - sleep 0.5 "${serverfiles}"/ts3server_startscript.sh stop > /dev/null 2>&1 check_status.sh if [ "${status}" == "0" ]; then @@ -266,10 +260,9 @@ fn_stop_teamspeak3(){ fn_stop_tmux(){ fn_print_dots "${servername}" fn_script_log_info "tmux kill-session: ${servername}" - sleep 0.5 # Kill tmux session tmux kill-session -t "${servicename}" > /dev/null 2>&1 - sleep 0.5 + fn_sleep_time check_status.sh if [ "${status}" == "0" ]; then # ARK doesn't clean up immediately after tmux is killed. @@ -304,7 +297,6 @@ fn_stop_pre_check(){ } fn_print_dots "${servername}" -sleep 0.5 check.sh info_config.sh fn_stop_pre_check @@ -314,4 +306,4 @@ if [ -f "${rootdir}/${lockselfname}" ]; then fi if [ -z "${exitbypass}" ]; then core_exit.sh -fi \ No newline at end of file +fi diff --git a/lgsm/functions/command_test_alert.sh b/lgsm/functions/command_test_alert.sh index ff5084696..014e082b2 100644 --- a/lgsm/functions/command_test_alert.sh +++ b/lgsm/functions/command_test_alert.sh @@ -9,7 +9,6 @@ local commandaction="Alert" local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_print_dots "${servername}" -sleep 0.5 check.sh info_config.sh alert="test" diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh index cbd3ad9ae..46a028a98 100644 --- a/lgsm/functions/command_ts3_server_pass.sh +++ b/lgsm/functions/command_ts3_server_pass.sh @@ -25,14 +25,12 @@ fn_serveradmin_password_prompt(){ fn_serveradmin_password_set(){ fn_print_info_nl "Starting server with new password..." fn_script_log_info "Starting server with new password" - sleep 0.5 # Start server in "new password mode" ts3serverpass="1" exitbypass="1" command_start.sh fn_print_ok_nl "Password applied" fn_script_log_pass "New ServerAdmin password applied" - sleep 0.5 } # Running functions diff --git a/lgsm/functions/command_update.sh b/lgsm/functions/command_update.sh index 9c366ae61..c3c289d97 100644 --- a/lgsm/functions/command_update.sh +++ b/lgsm/functions/command_update.sh @@ -9,7 +9,6 @@ local commandaction="Update" local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_print_dots "" -sleep 0.2 check.sh logs.sh diff --git a/lgsm/functions/command_update_linuxgsm.sh b/lgsm/functions/command_update_linuxgsm.sh index c4c49aee5..5d8422936 100644 --- a/lgsm/functions/command_update_linuxgsm.sh +++ b/lgsm/functions/command_update_linuxgsm.sh @@ -9,7 +9,6 @@ local commandaction="Update LinuxGSM" local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_print_dots "Updating LinuxGSM" -sleep 0.5 check.sh fn_script_log_info "Updating LinuxGSM" echo -en "\n" diff --git a/lgsm/functions/command_validate.sh b/lgsm/functions/command_validate.sh index c324b93b8..de999be25 100644 --- a/lgsm/functions/command_validate.sh +++ b/lgsm/functions/command_validate.sh @@ -9,15 +9,12 @@ local commandaction="Validate" local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_validation(){ + fn_print_info "Validating files: SteamCMD" echo "" - echo -e " * Validating may overwrite some customised files." - echo -en " * https://developer.valvesoftware.com/wiki/SteamCMD#Validate" - sleep 3 - echo -en "\n" - + echo -e "* Validating may overwrite some customised files." + echo -e "* https://docs.linuxgsm.com/commands/validate" fn_script_log_info "Validating files: SteamCMD" - sleep 0.5 - + sleep 3 cd "${steamcmddir}" || exit # Detects if unbuffer command is available for 32 bit distributions only. info_distro.sh @@ -44,9 +41,7 @@ fn_validation(){ } fn_print_dots "Validating files:" -sleep 0.5 fn_print_dots "Validating files: SteamCMD" -sleep 0.5 check.sh check_status.sh if [ "${status}" != "0" ]; then diff --git a/lgsm/functions/command_wipe.sh b/lgsm/functions/command_wipe.sh index fdcbe424d..7a98c2155 100644 --- a/lgsm/functions/command_wipe.sh +++ b/lgsm/functions/command_wipe.sh @@ -48,138 +48,131 @@ fn_wipe_server_remove_files(){ if [ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap.*.map")" ]; then currentaction="Removing map file(s): ${serveridentitydir}/proceduralmap.*.map" echo -en "Removing procedural map proceduralmap.*.map file(s)..." - sleep 0.5 + fn_sleep_time fn_script_log "${currentaction}" find "${serveridentitydir:?}" -type f -name "proceduralmap.*.map" -delete fn_wipe_exit_code - sleep 0.5 + fn_sleep_time else fn_print_information_nl "No procedural map file to remove" fn_script_log_info "No procedural map file to remove." - sleep 0.5 fi # Wipe procedural map save if [ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap.*.sav")" ]; then currentaction="Removing procedural map save(s): ${serveridentitydir}/proceduralmap.*.sav" echo -en "Removing map saves proceduralmap.*.sav file(s)..." - sleep 0.5 + fn_sleep_time fn_script_log "${currentaction}" find "${serveridentitydir:?}" -type f -name "proceduralmap.*.sav" -delete fn_wipe_exit_code - sleep 0.5 + fn_sleep_time else fn_print_information_nl "No procedural map save to remove" fn_script_log_info "No procedural map save to remove." - sleep 0.5 fi # Wipe Barren map if [ -n "$(find "${serveridentitydir}" -type f -name "barren*.map")" ]; then currentaction="Removing map file(s): ${serveridentitydir}/barren*.map" echo -en "Removing barren map barren*.map file(s)..." - sleep 0.5 + fn_sleep_time fn_script_log "${currentaction}" find "${serveridentitydir:?}" -type f -name "barren*.map" -delete fn_wipe_exit_code - sleep 0.5 + fn_sleep_time else fn_print_information_nl "No barren map file to remove" fn_script_log_info "No barren map file to remove." - sleep 0.5 fi # Wipe barren map save if [ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]; then currentaction="Removing barren map save(s): ${serveridentitydir}/barren*.sav" echo -en "Removing barren map saves barren*.sav file(s)..." - sleep 0.5 + fn_sleep_time fn_script_log "${currentaction}" find "${serveridentitydir:?}" -type f -name "barren*.sav" -delete fn_wipe_exit_code - sleep 0.5 + fn_sleep_time else fn_print_information_nl "No barren map save to remove" fn_script_log_info "No barren map save to remove." - sleep 0.5 fi # Wipe user dir, might be a legacy thing, maybe to be removed if [ -d "${serveridentitydir}/user" ]; then currentaction="Removing user directory: ${serveridentitydir}/user" echo -en "Removing user directory..." - sleep 0.5 + fn_sleep_time fn_script_log "${currentaction}" rm -rf "${serveridentitydir:?}/user" fn_wipe_exit_code - sleep 0.5 + fn_sleep_time # We do not print additional information if there is nothing to remove since this might be obsolete fi # Wipe storage dir, might be a legacy thing, maybe to be removed if [ -d "${serveridentitydir}/storage" ]; then currentaction="Removing storage directory: ${serveridentitydir}/storage" echo -en "Removing storage directory..." - sleep 0.5 + fn_sleep_time fn_script_log "${currentaction}" rm -rf "${serveridentitydir:?}/storage" fn_wipe_exit_code - sleep 0.5 + fn_sleep_time # We do not print additional information if there is nothing to remove since this might be obsolete fi # Wipe sv.files if [ -n "$(find "${serveridentitydir}" -type f -name "sv.files.*.db")" ]; then currentaction="Removing server misc files: ${serveridentitydir}/sv.files.*.db" echo -en "Removing server misc srv.files*.db file(s)..." - sleep 0.5 + fn_sleep_time fn_script_log "${currentaction}" find "${serveridentitydir:?}" -type f -name "sv.files.*.d" -delete fn_wipe_exit_code - sleep 0.5 + fn_sleep_time # No further information if not found because it should I could not get this file showing up fi # Wipe player death files if [ -n "$(find "${serveridentitydir}" -type f -name "player.deaths.*.db")" ]; then currentaction="Removing player death files: ${serveridentitydir}/player.deaths.*.db" echo -en "Removing player deaths player.deaths.*.db file(s)..." - sleep 0.5 + fn_sleep_time fn_script_log "${currentaction}" find "${serveridentitydir:?}" -type f -name "player.deaths.*.db" -delete fn_wipe_exit_code - sleep 0.5 + fn_sleep_time else fn_print_information_nl "No player death to remove" fn_script_log_info "No player death to remove." - sleep 0.5 fi # Wipe blueprints only if wipeall command was used if [ "${wipeall}" == "1" ]; then if [ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]; then currentaction="Removing blueprint file(s): ${serveridentitydir}/player.blueprints.*.db" echo -en "Removing blueprints player.blueprints.*.db file(s)..." - sleep 0.5 + fn_sleep_time fn_script_log "${currentaction}" find "${serveridentitydir:?}" -type f -name "player.blueprints.*.db" -delete fn_wipe_exit_code - sleep 0.5 + fn_sleep_time else fn_print_information_nl "No blueprint file to remove" fn_script_log_info "No blueprint file to remove." - sleep 0.5 fi elif [ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]; then fn_print_information_nl "Keeping blueprints" fn_script_log_info "Keeping blueprints." - sleep 0.5 else fn_print_information_nl "No blueprints found" fn_script_log_info "No blueprints found." - sleep 0.5 + fn_sleep_time fi # Wipe some logs that might be there if [ -n "$(find "${serveridentitydir}" -type f -name "Log.*.txt")" ]; then currentaction="Removing log files: ${serveridentitydir}/Log.*.txt" echo -en "Removing Log files..." - sleep 0.5 + fn_sleep_time fn_script_log "${currentaction}" find "${serveridentitydir:?}" -type f -name "Log.*.txt" -delete fn_wipe_exit_code - sleep 0.5 + fn_sleep_time # We do not print additional information if there are no logs to remove fi # You can add an "elif" here to add another game or engine @@ -195,12 +188,11 @@ if [ "${shortname}" == "rust" ]; then echo Exiting; core_exit.sh fi fn_script_log_info "User selects to erase any user, storage, log and map data from ${serveridentitydir}" - sleep 0.5 + fn_sleep_time fn_wipe_server_process else fn_print_information_nl "No data to wipe was found" fn_script_log_info "No data to wipe was found." - sleep 0.5 core_exit.sh fi # You can add an "elif" here to add another game or engine @@ -208,7 +200,6 @@ else # Game not listed fn_print_information_nl "Wipe is not available for this game" fn_script_log_info "Wipe is not available for this game." - sleep 0.5 core_exit.sh fi diff --git a/lgsm/functions/core_dl.sh b/lgsm/functions/core_dl.sh index 3018dcf13..910e1dec8 100644 --- a/lgsm/functions/core_dl.sh +++ b/lgsm/functions/core_dl.sh @@ -41,7 +41,7 @@ fn_dl_md5(){ # Runs MD5 Check if available. if [ "${md5}" != "0" ]&&[ "${md5}" != "nomd5" ]; then echo -en "verifying ${local_filename} with MD5..." - sleep 0.5 + fn_sleep_time local md5sumcmd=$(md5sum "${local_filedir}/${local_filename}"|awk '{print $1;}') if [ "${md5sumcmd}" != "${md5}" ]; then fn_print_fail_eol_nl @@ -104,7 +104,7 @@ fn_fetch_trap(){ echo -en "downloading ${local_filename}..." fn_print_canceled_eol_nl fn_script_log_info "Downloading ${local_filename}...CANCELED" - sleep 0.5 + fn_sleep_time rm -f "${local_filedir}/${local_filename}" echo -en "downloading ${local_filename}..." fn_print_removed_eol_nl @@ -131,7 +131,7 @@ fn_fetch_file(){ # Larger files show a progress bar. if [ "${local_filename##*.}" == "bz2" ]||[ "${local_filename##*.}" == "gz" ]||[ "${local_filename##*.}" == "zip" ]||[ "${local_filename##*.}" == "jar" ]||[ "${local_filename##*.}" == "xz" ]; then echo -en "downloading ${local_filename}..." - sleep 0.5 + fn_sleep_time echo -en "\033[1K" curlcmd=$(${curlpath} --progress-bar --fail -L -o "${local_filedir}/${local_filename}" "${remote_fileurl}") echo -en "downloading ${local_filename}..." diff --git a/lgsm/functions/core_messages.sh b/lgsm/functions/core_messages.sh index 74ae8cf5d..e28e65765 100644 --- a/lgsm/functions/core_messages.sh +++ b/lgsm/functions/core_messages.sh @@ -28,6 +28,12 @@ fn_ansi_loader(){ creeol="\r\033[K" } +fn_sleep_time(){ + if [ "${sleeptime}" != "0" ]||[ "${travistest}" != "1" ]; then + sleep "${sleeptime}" + fi +} + # Log display ######################## ## Feb 28 14:56:58 ut99-server: Monitor: @@ -110,6 +116,7 @@ fn_print_dots(){ else echo -en "${creeol}[ .... ] $@" fi + fn_sleep_time } fn_print_dots_nl(){ @@ -118,7 +125,7 @@ fn_print_dots_nl(){ else echo -e "${creeol}[ .... ] $@" fi - sleep 0.5 + fn_sleep_time echo -en "\n" } @@ -129,6 +136,7 @@ fn_print_ok(){ else echo -en "${creeol}[${green} OK ${default}] $@" fi + fn_sleep_time } fn_print_ok_nl(){ @@ -137,7 +145,7 @@ fn_print_ok_nl(){ else echo -en "${creeol}[${green} OK ${default}] $@" fi - sleep 0.5 + fn_sleep_time echo -en "\n" } @@ -148,6 +156,7 @@ fn_print_fail(){ else echo -en "${creeol}[${red} FAIL ${default}] $@" fi + fn_sleep_time } fn_print_fail_nl(){ @@ -156,7 +165,7 @@ fn_print_fail_nl(){ else echo -en "${creeol}[${red} FAIL ${default}] $@" fi - sleep 0.5 + fn_sleep_time echo -en "\n" } @@ -167,6 +176,7 @@ fn_print_error(){ else echo -en "${creeol}[${red}ERROR ${default}] $@" fi + fn_sleep_time } fn_print_error_nl(){ @@ -175,7 +185,7 @@ fn_print_error_nl(){ else echo -en "${creeol}[${red}ERROR ${default}] $@" fi - sleep 0.5 + fn_sleep_time echo -en "\n" } @@ -186,6 +196,7 @@ fn_print_warn(){ else echo -en "${creeol}[${yellow} WARN ${default}] $@" fi + fn_sleep_time } fn_print_warn_nl(){ @@ -194,7 +205,7 @@ fn_print_warn_nl(){ else echo -en "${creeol}[${yellow} WARN ${default}] $@" fi - sleep 0.5 + fn_sleep_time echo -en "\n" } @@ -205,6 +216,7 @@ fn_print_info(){ else echo -en "${creeol}[${cyan} INFO ${default}] $@" fi + fn_sleep_time } fn_print_info_nl(){ @@ -213,7 +225,7 @@ fn_print_info_nl(){ else echo -en "${creeol}[${cyan} INFO ${default}] $@" fi - sleep 0.5 + fn_sleep_time echo -en "\n" } @@ -232,46 +244,56 @@ fn_print_header(){ # Complete! fn_print_complete(){ echo -en "${green}Complete!${default} $@" + fn_sleep_time } fn_print_complete_nl(){ echo -e "${green}Complete!${default} $@" + fn_sleep_time } # Failure! fn_print_failure(){ echo -en "${red}Failure!${default} $@" + fn_sleep_time } fn_print_failure_nl(){ echo -e "${red}Failure!${default} $@" + fn_sleep_time } # Error! fn_print_error2(){ echo -en "${red}Error!${default} $@" + fn_sleep_time } fn_print_error2_nl(){ echo -e "${red}Error!${default} $@" + fn_sleep_time } # Warning! fn_print_warning(){ echo -en "${yellow}Warning!${default} $@" + fn_sleep_time } fn_print_warning_nl(){ echo -e "${yellow}Warning!${default} $@" + fn_sleep_time } # Information! fn_print_information(){ echo -en "${cyan}Information!${default} $@" + fn_sleep_time } fn_print_information_nl(){ echo -e "${cyan}Information!${default} $@" + fn_sleep_time } # Y/N Prompt diff --git a/lgsm/functions/fix.sh b/lgsm/functions/fix.sh index da9c362e4..9fddc3189 100644 --- a/lgsm/functions/fix.sh +++ b/lgsm/functions/fix.sh @@ -11,18 +11,14 @@ local commandaction="Fix" # Messages that are displayed for some fixes fn_fix_msg_start(){ fn_print_dots "Applying ${fixname} fix: ${gamename}" - sleep 0.5 fn_print_info "Applying ${fixname} fix: ${gamename}" fn_script_log_info "Applying ${fixname} fix: ${gamename}" - sleep 0.5 } fn_fix_msg_start_nl(){ fn_print_dots "Applying ${fixname} fix: ${gamename}" - sleep 0.5 fn_print_info "Applying ${fixname} fix: ${gamename}" fn_script_log_info "Applying ${fixname} fix: ${gamename}" - sleep 0.5 } fn_fix_msg_end(){ @@ -82,7 +78,7 @@ if [ "${function_selfname}" == "command_install.sh" ]; then echo "" echo "Applying Post-Install Fixes" echo "=================================" - sleep 0.5 + fn_sleep_time if [ "${shortname}" == "kf" ]; then fix_kf.sh elif [ "${shortname}" == "kf2" ]; then diff --git a/lgsm/functions/fix_kf.sh b/lgsm/functions/fix_kf.sh index dbb0c78c1..e9f5f3860 100644 --- a/lgsm/functions/fix_kf.sh +++ b/lgsm/functions/fix_kf.sh @@ -12,15 +12,15 @@ echo "Applying WebAdmin ROOst.css fix." echo "http://forums.tripwireinteractive.com/showpost.php?p=585435&postcount=13" sed -i 's/none}/none;/g' "${serverfiles}/Web/ServerAdmin/ROOst.css" sed -i 's/underline}/underline;/g' "${serverfiles}/Web/ServerAdmin/ROOst.css" -sleep 0.5 +fn_sleep_time echo "Applying WebAdmin CharSet fix." echo "http://forums.tripwireinteractive.com/showpost.php?p=442340&postcount=1" sed -i 's/CharSet="iso-8859-1"/CharSet="utf-8"/g' "${systemdir}/UWeb.int" -sleep 0.5 +fn_sleep_time echo "applying server name fix." -sleep 0.5 +fn_sleep_time echo "forcing server restart..." -sleep 0.5 +fn_sleep_time exitbypass=1 command_start.sh sleep 5 diff --git a/lgsm/functions/fix_kf2.sh b/lgsm/functions/fix_kf2.sh index 3e3e23080..e8f3440f0 100644 --- a/lgsm/functions/fix_kf2.sh +++ b/lgsm/functions/fix_kf2.sh @@ -13,9 +13,9 @@ parms="\"${defaultmap}?Game=KFGameContent.KFGameInfo_VersusSurvival\"" } fn_print_information "starting ${gamename} server to generate configs." -sleep 1 +fn_sleep_time exitbypass=1 command_start.sh sleep 10 exitbypass=1 -command_stop.sh \ No newline at end of file +command_stop.sh diff --git a/lgsm/functions/fix_mta.sh b/lgsm/functions/fix_mta.sh index e8943f5e1..4eb4ff900 100644 --- a/lgsm/functions/fix_mta.sh +++ b/lgsm/functions/fix_mta.sh @@ -11,7 +11,7 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" if [ ! -f "${lgsmdir}/lib/libmysqlclient.so.16" ]; then fixname="libmysqlclient16" fn_fix_msg_start_nl - sleep 0.5 + fn_sleep_time fn_fetch_file "https://nightly.mtasa.com/files/modules/64/libmysqlclient.so.16" "${lgsmdir}/lib" "libmysqlclient.so.16" "chmodx" "norun" "noforce" "6c188e0f8fb5d7a29f4bc413b9fed6c2" fn_fix_msg_end fi diff --git a/lgsm/functions/fix_ro.sh b/lgsm/functions/fix_ro.sh index b96ae582e..1ded9824b 100644 --- a/lgsm/functions/fix_ro.sh +++ b/lgsm/functions/fix_ro.sh @@ -12,18 +12,18 @@ echo "Applying WebAdmin ROOst.css fix." echo "http://forums.tripwireinteractive.com/showpost.php?p=585435&postcount=13" sed -i 's/none}/none;/g' "${serverfiles}/Web/ServerAdmin/ROOst.css" sed -i 's/underline}/underline;/g' "${serverfiles}/Web/ServerAdmin/ROOst.css" -sleep 0.5 +fn_sleep_time echo "Applying WebAdmin CharSet fix." echo "http://forums.tripwireinteractive.com/showpost.php?p=442340&postcount=1" sed -i 's/CharSet="iso-8859-1"/CharSet="utf-8"/g' "${systemdir}/uweb.int" -sleep 0.5 +fn_sleep_time echo "Applying Steam AppID fix." sed -i 's/1210/1200/g' "${systemdir}/steam_appid.txt" -sleep 0.5 +fn_sleep_time echo "applying server name fix." -sleep 0.5 +fn_sleep_time echo "forcing server restart..." -sleep 0.5 +fn_sleep_time exitbypass=1 command_start.sh sleep 5 diff --git a/lgsm/functions/fix_ut.sh b/lgsm/functions/fix_ut.sh index aaaad40cb..7e9b7dc97 100644 --- a/lgsm/functions/fix_ut.sh +++ b/lgsm/functions/fix_ut.sh @@ -11,4 +11,4 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" #Set Binary Executable echo "chmod +x ${executabledir}/${executable}" chmod +x "${executabledir}/${executable}" -sleep 0.5 \ No newline at end of file +fn_sleep_time \ No newline at end of file diff --git a/lgsm/functions/fix_ut2k4.sh b/lgsm/functions/fix_ut2k4.sh index b29b312c3..3789909b3 100644 --- a/lgsm/functions/fix_ut2k4.sh +++ b/lgsm/functions/fix_ut2k4.sh @@ -12,15 +12,15 @@ echo "applying WebAdmin ut2003.css fix." echo "http://forums.tripwireinteractive.com/showpost.php?p=585435&postcount=13" sed -i 's/none}/none;/g' "${serverfiles}/Web/ServerAdmin/ut2003.css" sed -i 's/underline}/underline;/g' "${serverfiles}/Web/ServerAdmin/ut2003.css" -sleep 0.5 +fn_sleep_time echo "applying WebAdmin CharSet fix." echo "http://forums.tripwireinteractive.com/showpost.php?p=442340&postcount=1" sed -i 's/CharSet="iso-8859-1"/CharSet="utf-8"/g' "${systemdir}/UWeb.int" -sleep 0.5 +fn_sleep_time echo "applying server name fix." -sleep 0.5 +fn_sleep_time echo "forcing server restart." -sleep 0.5 +fn_sleep_time exitbypass=1 command_start.sh sleep 5 diff --git a/lgsm/functions/fix_ut3.sh b/lgsm/functions/fix_ut3.sh index fa95052ac..53bde310f 100644 --- a/lgsm/functions/fix_ut3.sh +++ b/lgsm/functions/fix_ut3.sh @@ -13,9 +13,9 @@ parms="server VCTF-Suspense?Game=UTGameContent.UTVehicleCTFGame_Content?bIsDedic } fn_print_information "starting ${gamename} server to generate configs." -sleep 1 +fn_sleep_time exitbypass=1 command_start.sh sleep 10 exitbypass=1 -command_stop.sh \ No newline at end of file +command_stop.sh diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index f9c7e1cb2..997624f73 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -23,7 +23,7 @@ fn_fetch_default_config(){ echo "Downloading ${gamename} Configs" echo "=================================" echo "default configs from https://github.com/GameServerManagers/Game-Server-Configs" - sleep 0.5 + fn_sleep_time mkdir -p "${lgsmdir}/config-default/config-game" githuburl="https://raw.githubusercontent.com/GameServerManagers/Game-Server-Configs/master" for config in "${array_configs[@]}"; do @@ -50,14 +50,14 @@ fn_default_config_remote(){ cp -nv "${lgsmdir}/config-default/config-game/${config}" "${servercfgdir}/${config}" fi done - sleep 0.5 + fn_sleep_time } # Copys local default config to server config location fn_default_config_local(){ echo "copying ${servercfgdefault} config file." cp -nv "${servercfgfullpathdefault}" "${servercfgfullpath}" - sleep 0.5 + fn_sleep_time } # Changes some variables within the default configs @@ -70,7 +70,7 @@ fn_set_config_vars(){ rconpass="admin${random}" echo "changing hostname." fn_script_log_info "changing hostname." - sleep 0.5 + fn_sleep_time # prevents var from being overwritten with the servername if grep -q "SERVERNAME=SERVERNAME" "${lgsmdir}/config-default/config-game/${config}" 2>/dev/null; then sed -i "s/SERVERNAME=SERVERNAME/SERVERNAME=${servername}/g" "${servercfgfullpath}" @@ -86,11 +86,11 @@ fn_set_config_vars(){ else sed -i "s/ADMINPASSWORD/${rconpass}/g" "${servercfgfullpath}" fi - sleep 0.5 + fn_sleep_time else fn_script_log_warn "Config file not found, cannot alter it." echo "Config file not found, cannot alter it." - sleep 0.5 + fn_sleep_time fi } @@ -101,16 +101,16 @@ fn_set_dst_config_vars(){ echo "changing server name." fn_script_log_info "changing server name." sed -i "s/SERVERNAME/LinuxGSM/g" "${clustercfgfullpath}" - sleep 0.5 + fn_sleep_time echo "changing shard mode." fn_script_log_info "changing shard mode." sed -i "s/USESHARDING/${sharding}/g" "${clustercfgfullpath}" - sleep 0.5 + fn_sleep_time echo "randomizing cluster key." fn_script_log_info "randomizing cluster key." randomkey=$(tr -dc A-Za-z0-9_ < /dev/urandom | head -c 8 | xargs) sed -i "s/CLUSTERKEY/${randomkey}/g" "${clustercfgfullpath}" - sleep 0.5 + fn_sleep_time else echo "${clustercfg} is already configured." fn_script_log_info "${clustercfg} is already configured." @@ -128,11 +128,11 @@ fn_set_dst_config_vars(){ echo "changing shard name." fn_script_log_info "changing shard name." sed -i "s/SHARDNAME/${shard}/g" "${servercfgfullpath}" - sleep 0.5 + fn_sleep_time echo "changing master setting." fn_script_log_info "changing master setting." sed -i "s/ISMASTER/${master}/g" "${servercfgfullpath}" - sleep 0.5 + fn_sleep_time ## worldgenoverride.lua if [ "${cave}" == "true" ]; then @@ -140,7 +140,7 @@ fn_set_dst_config_vars(){ fn_script_log_info "defining ${shard} as cave in ${servercfgdir}/worldgenoverride.lua." echo 'return { override_enabled = true, preset = "DST_CAVE", }' > "${servercfgdir}/worldgenoverride.lua" fi - sleep 0.5 + fn_sleep_time echo "" } diff --git a/lgsm/functions/install_dst_token.sh b/lgsm/functions/install_dst_token.sh index 11a4c3679..616a6469b 100644 --- a/lgsm/functions/install_dst_token.sh +++ b/lgsm/functions/install_dst_token.sh @@ -11,7 +11,7 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "" echo "Enter ${gamename} Cluster Token" echo "=================================" -sleep 0.5 +fn_sleep_time echo "A cluster token is required to run this server!" echo "Follow the instructions in this link to obtain this key:" echo "https://linuxgsm.com/dst-auth-token" diff --git a/lgsm/functions/install_eula.sh b/lgsm/functions/install_eula.sh index cc676f0dc..fca4838af 100644 --- a/lgsm/functions/install_eula.sh +++ b/lgsm/functions/install_eula.sh @@ -15,7 +15,7 @@ fi echo "" echo "Accept ${gamename} EULA" echo "=================================" -sleep 0.5 +fn_sleep_time echo "You are required to accept the EULA:" echo "${eulaurl}" echo "" diff --git a/lgsm/functions/install_factorio_save.sh b/lgsm/functions/install_factorio_save.sh index 3b243c9d4..804ef88e7 100644 --- a/lgsm/functions/install_factorio_save.sh +++ b/lgsm/functions/install_factorio_save.sh @@ -10,6 +10,6 @@ local commandaction="Install" echo "" echo "Creating initial Factorio savefile" echo "=================================" -sleep 0.5 +fn_sleep_time check_glibc.sh "${executabledir}"/factorio --create "${serverfiles}/save1" diff --git a/lgsm/functions/install_gslt.sh b/lgsm/functions/install_gslt.sh index 2c8c0e9f3..87fccae70 100644 --- a/lgsm/functions/install_gslt.sh +++ b/lgsm/functions/install_gslt.sh @@ -11,7 +11,7 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "" echo "Game Server Login Token" echo "=================================" -sleep 0.5 +fn_sleep_time if [ "${shortname}" == "csgo" ]||[ "${shortname}" == "css" ]||[ "${shortname}" == "nmrih" ]||[ "${shortname}" == "bs" ]; then echo "GSLT is required to run a public ${gamename} server" fn_script_log_info "GSLT is required to run a public ${gamename} server" @@ -37,7 +37,7 @@ if [ -z "${autoinstall}" ]; then fi fi fi -sleep 0.5 +fn_sleep_time if [ "${shortname}" == "tu" ]; then echo "The GSLT can be changed by editing ${servercfgdir}/${servercfg}." fn_script_log_info "The GSLT can be changed by editing ${servercfgdir}/${servercfg}." diff --git a/lgsm/functions/install_logs.sh b/lgsm/functions/install_logs.sh index bc8184839..d02bb8e35 100644 --- a/lgsm/functions/install_logs.sh +++ b/lgsm/functions/install_logs.sh @@ -13,7 +13,7 @@ if [ "${checklogs}" != "1" ]; then echo "Creating log directories" echo "=================================" fi -sleep 0.5 +fn_sleep_time # Create LinuxGSM logs echo -en "installing log dir: ${logdir}..." mkdir -p "${logdir}" @@ -102,5 +102,5 @@ if [ -d "${rootdir}/Steam/logs" ]; then fi fi fi -sleep 0.5 +fn_sleep_time fn_script_log_info "Logs installed" diff --git a/lgsm/functions/install_server_dir.sh b/lgsm/functions/install_server_dir.sh index abb8f6fb0..18255ebd8 100644 --- a/lgsm/functions/install_server_dir.sh +++ b/lgsm/functions/install_server_dir.sh @@ -11,7 +11,7 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "" echo "Server Directory" echo "=================================" -sleep 0.5 +fn_sleep_time if [ -d "${serverfiles}" ]; then fn_print_warning_nl "A server is already installed here." fi diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 67b4af9fe..e921e9c15 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -131,7 +131,7 @@ fn_install_server_files_steamcmd(){ echo "" echo "Installing ${gamename} Server" echo "=================================" -sleep 0.5 +fn_sleep_time if [ -n "${appid}" ]; then fn_install_server_files_steamcmd diff --git a/lgsm/functions/install_squad_license.sh b/lgsm/functions/install_squad_license.sh index 3b0711309..f9cf40835 100644 --- a/lgsm/functions/install_squad_license.sh +++ b/lgsm/functions/install_squad_license.sh @@ -11,7 +11,7 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "" echo "Squad Server License" echo "=================================" -sleep 0.5 +fn_sleep_time echo "Server license is an optional feature for ${gamename} server" fn_script_log_info "Server license is an optional feature for ${gamename} server" @@ -20,7 +20,7 @@ echo "http://forums.joinsquad.com/topic/16519-server-licensing-general-info/" fn_script_log_info "Get more info and a server license here:" fn_script_log_info "http://forums.joinsquad.com/topic/16519-server-licensing-general-info/" echo "" -sleep 0.5 +fn_sleep_time echo "The Squad server license can be changed by editing ${servercfgdir}/License.cfg." fn_script_log_info "The Squad server license can be changed by editing ${selfname}." echo "" \ No newline at end of file diff --git a/lgsm/functions/install_steamcmd.sh b/lgsm/functions/install_steamcmd.sh index 10d095423..4b24c4274 100644 --- a/lgsm/functions/install_steamcmd.sh +++ b/lgsm/functions/install_steamcmd.sh @@ -10,5 +10,5 @@ local commandaction="Install" echo "" echo "Installing SteamCMD" echo "=================================" -sleep 0.5 +fn_sleep_time check_steamcmd.sh diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh index 77dea1bae..264f2597f 100644 --- a/lgsm/functions/install_ts3db.sh +++ b/lgsm/functions/install_ts3db.sh @@ -27,7 +27,7 @@ fn_install_ts3db_mariadb(){ echo "" echo "Configure ${gamename} Server for MariaDB" echo "=================================" - sleep 0.5 + fn_sleep_time read -rp "Enter MariaDB hostname: " mariahostname read -rp "Enter MariaDB port: " mariaport read -rp "Enter MariaDB username: " mariausername @@ -48,13 +48,13 @@ fn_install_ts3db_mariadb(){ sed -i "s/dbpluginparameter=/dbpluginparameter=ts3db_mariadb.ini/g" "${servercfgfullpath}" sed -i "s/dbsqlcreatepath=create_sqlite\//dbsqlcreatepath=create_mariadb\//g" "${servercfgfullpath}" echo "updating ts3db_mariadb.ini." - sleep 0.5 + fn_sleep_time } echo "" echo "Select Database" echo "=================================" -sleep 0.5 +fn_sleep_time if [ -z "${autoinstall}" ]; then if fn_prompt_yn "Do you want to use MariaDB instead of sqlite? (MariaDB must be pre-configured)" N; then fn_install_ts3db_mariadb @@ -69,9 +69,8 @@ install_eula.sh echo "" echo "Getting privilege key" echo "=================================" -sleep 0.5 +fn_sleep_time fn_print_information_nl "Save these details for later." -sleep 0.5 cd "${executabledir}" || exit ${executable} start inifile=ts3-server.ini sleep 5 diff --git a/lgsm/functions/install_ut2k4_key.sh b/lgsm/functions/install_ut2k4_key.sh index f1e840462..0f0fe6da5 100644 --- a/lgsm/functions/install_ut2k4_key.sh +++ b/lgsm/functions/install_ut2k4_key.sh @@ -11,7 +11,7 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "" echo "Enter ${gamename} CD Key" echo "=================================" -sleep 0.5 +fn_sleep_time echo "To get your server listed on the Master Server list" echo "you must get a free CD key. Get a key here:" echo "https://forums.unrealtournament.com/utserver/cdkey.php?2004" diff --git a/lgsm/functions/logs.sh b/lgsm/functions/logs.sh index 69dbc7deb..803f9e243 100644 --- a/lgsm/functions/logs.sh +++ b/lgsm/functions/logs.sh @@ -22,7 +22,7 @@ if [ "${status}" != "0" ]&&[ "${function_selfname}" == "command_start.sh" ]&&[ - fn_print_info "Moving game logs to ${gamelogdir}" fn_script_log_info "Moving game logs to ${gamelogdir}" echo -en "\n" - sleep 0.5 + fn_sleep_time mv "${systemdir}"/gamelog*.log "${gamelogdir}" fi fi @@ -40,7 +40,7 @@ if [ $(find "${lgsmlogdir}"/ -type f -mtime +"${logdays}" | wc -l) -ne "0" ]; th legacyserverlogdir="${logdir}/server" # Setting up counting variables scriptcount="0" ; consolecount="0" ; gamecount="0" ; srcdscount="0" ; smcount="0" ; ulxcount="0" ; darkrpcount="0" ; legacycount="0" - sleep 0.5 + fn_sleep_time fn_print_ok_nl "Starting" fn_print_info_nl "Removing logs older than ${logdays} days" fn_script_log_info "Removing logs older than ${logdays} days" diff --git a/lgsm/functions/mods_core.sh b/lgsm/functions/mods_core.sh index cf2178b3c..c65727738 100644 --- a/lgsm/functions/mods_core.sh +++ b/lgsm/functions/mods_core.sh @@ -38,7 +38,7 @@ fn_mod_lowercase(){ if [ "${modlowercase}" == "LowercaseOn" ]; then echo -en "converting ${modprettyname} files to lowercase..." - sleep 0.5 + fn_sleep_time fn_script_log_info "Converting ${modprettyname} files to lowercase" fileswc=$(find "${extractdir}" -depth | wc -l) echo -en "\r" @@ -61,14 +61,14 @@ fn_mod_lowercase(){ else fn_print_ok_eol_nl fi - sleep 0.5 + fn_sleep_time fi } # Create ${modcommand}-files.txt containing the full extracted file/directory list fn_mod_create_filelist(){ echo -en "building ${modcommand}-files.txt..." - sleep 0.5 + fn_sleep_time # ${modsdir}/${modcommand}-files.txt find "${extractdir}" -mindepth 1 -printf '%P\n' > "${modsdir}/${modcommand}-files.txt" local exitcode=$? @@ -84,13 +84,13 @@ fn_mod_create_filelist(){ if [ -f "${modsdir}/.removedfiles.tmp" ]; then cat "${modsdir}/.removedfiles.tmp" >> "${modsdir}/${modcommand}-files.txt" fi - sleep 0.5 + fn_sleep_time } # Copy the mod into serverfiles fn_mod_copy_destination(){ echo -en "copying ${modprettyname} to ${modinstalldir}..." - sleep 0.5 + fn_sleep_time cp -Rf "${extractdir}/." "${modinstalldir}/" local exitcode=$? if [ ${exitcode} -ne 0 ]; then @@ -116,7 +116,7 @@ fn_mod_tidy_files_list(){ fn_check_mod_files_list # Output to the user echo -en "tidy up ${modcommand}-files.txt..." - sleep 0.5 + fn_sleep_time fn_script_log_info "Tidy up ${modcommand}-files.txt" # Lines/files to remove from file list (end with ";" separator) removefromlist="cfg;addons;RustDedicated_Data;RustDedicated_Data\/Managed;RustDedicated_Data\/Managed\/x86;RustDedicated_Data\/Managed\/x64;" @@ -354,7 +354,7 @@ fn_create_mods_dir(){ fn_print_ok_eol_nl fn_script_log_pass "Creating mod download dir ${modsdir}" fi - sleep 0.5 + fn_sleep_time fi # Create mod install directory if [ ! -d "${modinstalldir}" ]; then @@ -369,7 +369,7 @@ fn_create_mods_dir(){ fn_print_ok_eol_nl fn_script_log_pass "Creating mod install directory ${modinstalldir}" fi - sleep 0.5 + fn_sleep_time fi # Create lgsm/data/${modsinstalledlist} diff --git a/lgsm/functions/update_factorio.sh b/lgsm/functions/update_factorio.sh index 6efd56024..c6d27ee65 100644 --- a/lgsm/functions/update_factorio.sh +++ b/lgsm/functions/update_factorio.sh @@ -28,7 +28,6 @@ fn_update_factorio_dl(){ fn_update_factorio_localbuild(){ # Gets local build info. fn_print_dots "Checking for update: ${remotelocation}: checking local build" - sleep 0.5 # Uses executable to find local build. cd "${executabledir}" || exit if [ -f "${executable}" ]; then @@ -40,7 +39,6 @@ fn_update_factorio_localbuild(){ fn_print_error "Checking for update: ${remotelocation}: checking local build" fn_script_log_error "Checking local build" fi - sleep 0.5 } fn_update_factorio_remotebuild(){ @@ -48,7 +46,6 @@ fn_update_factorio_remotebuild(){ remotebuild=$(${curlpath} -s "https://factorio.com/get-download/${downloadbranch}/headless/${factorioarch}" | grep -o '[0-9]\.[0-9]\{1,\}\.[0-9]\{1,\}' | head -1) if [ "${installer}" != "1" ]; then fn_print_dots "Checking for update: ${remotelocation}: checking remote build" - sleep 0.5 # Checks if remotebuild variable has been set. if [ -z "${remotebuild}" ]||[ "${remotebuild}" == "null" ]; then fn_print_fail "Checking for update: ${remotelocation}: checking remote build" @@ -57,7 +54,6 @@ fn_update_factorio_remotebuild(){ else fn_print_ok "Checking for update: ${remotelocation}: checking remote build" fn_script_log_pass "Checking remote build" - sleep 0.5 fi else # Checks if remotebuild variable has been set. @@ -66,18 +62,16 @@ fn_update_factorio_remotebuild(){ fn_script_log_fatal "Unable to get remote build" core_exit.sh fi - fi + fi } fn_update_factorio_compare(){ fn_print_dots "Checking for update: ${remotelocation}" - sleep 0.5 # Removes dots so if statement can compare version numbers. localbuilddigit=$(echo "${localbuild}" | tr -cd '[:digit:]') remotebuilddigit=$(echo "${remotebuild}" | tr -cd '[:digit:]') if [ "${localbuilddigit}" -ne "${remotebuilddigit}" ]||[ "${forceupdate}" == "1" ]; then fn_print_ok_nl "Checking for update: ${remotelocation}" - sleep 0.5 echo -en "\n" echo -e "Update available" echo -e "* Local build: ${red}${localbuild} ${factorioarch}${default}" @@ -92,7 +86,7 @@ fn_update_factorio_compare(){ fn_script_log_info "Branch: ${branch}" fi fn_script_log_info "${localbuild} > ${remotebuild}" - sleep 0.5 + fn_sleep_time echo -en "\n" echo -en "applying update.\r" sleep 1 @@ -126,7 +120,6 @@ fn_update_factorio_compare(){ alert.sh else fn_print_ok_nl "Checking for update: ${remotelocation}" - sleep 0.5 echo -en "\n" echo -e "No update available" echo -e "* Local build: ${green}${localbuild} ${factorioarch}${default}" @@ -163,7 +156,6 @@ if [ "${installer}" == "1" ]; then else fn_print_dots "Checking for update: ${remotelocation}" fn_script_log_info "Checking for update: ${remotelocation}" - sleep 0.5 fn_update_factorio_localbuild fn_update_factorio_remotebuild fn_update_factorio_compare diff --git a/lgsm/functions/update_minecraft.sh b/lgsm/functions/update_minecraft.sh index 3cf19731a..8fa3ef40a 100644 --- a/lgsm/functions/update_minecraft.sh +++ b/lgsm/functions/update_minecraft.sh @@ -30,18 +30,14 @@ fn_update_minecraft_dl(){ fn_update_minecraft_localbuild(){ # Gets local build info. fn_print_dots "Checking for update: ${remotelocation}: checking local build" - sleep 0.5 # Uses log file to gather info. # Gives time for log file to generate. if [ ! -f "${serverfiles}/logs/latest.log" ]; then fn_print_error "Checking for update: ${remotelocation}: checking local build" - sleep 0.5 fn_print_error_nl "Checking for update: ${remotelocation}: checking local build: no log files" fn_script_log_error "No log file found" - sleep 0.5 fn_print_info_nl "Checking for update: ${remotelocation}: checking local build: forcing server restart" fn_script_log_info "Forcing server restart" - sleep 0.5 exitbypass=1 command_stop.sh exitbypass=1 @@ -61,7 +57,6 @@ fn_update_minecraft_localbuild(){ fn_print_error "Checking for update: ${remotelocation}: waiting for log file: missing log file" fn_script_log_error "Missing log file" fn_script_log_error "Set localbuild to 0" - sleep 0.5 fi totalseconds=$((totalseconds + 1)) @@ -99,7 +94,6 @@ fn_update_minecraft_localbuild(){ fn_print_ok "Checking for update: ${remotelocation}: checking local build" fn_script_log_pass "Checking local build" fi - sleep 0.5 } fn_update_minecraft_remotebuild(){ @@ -107,7 +101,6 @@ fn_update_minecraft_remotebuild(){ remotebuild=$(${curlpath} -s "https://launchermeta.${remotelocation}/mc/game/version_manifest.json" | jq -r '.latest.release') if [ "${installer}" != "1" ]; then fn_print_dots "Checking for update: ${remotelocation}: checking remote build" - sleep 0.5 # Checks if remotebuild variable has been set. if [ -z "${remotebuild}" ]||[ "${remotebuild}" == "null" ]; then fn_print_fail "Checking for update: ${remotelocation}: checking remote build" @@ -116,7 +109,6 @@ fn_update_minecraft_remotebuild(){ else fn_print_ok "Checking for update: ${remotelocation}: checking remote build" fn_script_log_pass "Checking remote build" - sleep 0.5 fi else # Checks if remotebuild variable has been set. @@ -131,12 +123,10 @@ fn_update_minecraft_remotebuild(){ fn_update_minecraft_compare(){ # Removes dots so if statement can compare version numbers. fn_print_dots "Checking for update: ${remotelocation}" - sleep 0.5 localbuilddigit=$(echo "${localbuild}" | tr -cd '[:digit:]') remotebuilddigit=$(echo "${remotebuild}" | tr -cd '[:digit:]') if [ "${localbuilddigit}" -ne "${remotebuilddigit}" ]||[ "${forceupdate}" == "1" ]; then fn_print_ok_nl "Checking for update: ${remotelocation}" - sleep 0.5 echo -en "\n" echo -e "Update available" echo -e "* Local build: ${red}${localbuild}${default}" @@ -145,7 +135,7 @@ fn_update_minecraft_compare(){ fn_script_log_info "Local build: ${localbuild}" fn_script_log_info "Remote build: ${remotebuild}" fn_script_log_info "${localbuild} > ${remotebuild}" - sleep 0.5 + fn_sleep_time echo -en "\n" echo -en "applying update.\r" sleep 1 @@ -179,7 +169,6 @@ fn_update_minecraft_compare(){ alert.sh else fn_print_ok_nl "Checking for update: ${remotelocation}" - sleep 0.5 echo -en "\n" echo -e "No update available" echo -e "* Local build: ${green}${localbuild}${default}" @@ -199,7 +188,6 @@ if [ "${installer}" == "1" ]; then else fn_print_dots "Checking for update: ${remotelocation}" fn_script_log_info "Checking for update: ${remotelocation}" - sleep 0.5 fn_update_minecraft_localbuild fn_update_minecraft_remotebuild fn_update_minecraft_compare diff --git a/lgsm/functions/update_mta.sh b/lgsm/functions/update_mta.sh index 90eb424f5..935ab474e 100644 --- a/lgsm/functions/update_mta.sh +++ b/lgsm/functions/update_mta.sh @@ -30,18 +30,14 @@ fn_update_mta_dl(){ fn_update_mta_localbuild(){ # Gets local build info. fn_print_dots "Checking for update: ${remotelocation}: checking local build" - sleep 0.5 # Uses log file to gather info. # Gives time for log file to generate. if [ ! -f "${serverfiles}/mods/deathmatch/logs/server.log" ]; then fn_print_error "Checking for update: ${remotelocation}: checking local build" - sleep 0.5 fn_print_error_nl "Checking for update: ${remotelocation}: checking local build: no log files" fn_script_log_error "No log file found" - sleep 0.5 fn_print_info_nl "Checking for update: ${remotelocation}: checking local build: forcing server restart" fn_script_log_info "Forcing server restart" - sleep 0.5 exitbypass=1 command_stop.sh exitbypass=1 @@ -61,7 +57,6 @@ fn_update_mta_localbuild(){ fn_print_error "Checking for update: ${remotelocation}: waiting for log file: missing log file" fn_script_log_error "Missing log file" fn_script_log_error "Set localbuild to 0" - sleep 0.5 fi totalseconds=$((totalseconds + 1)) @@ -100,7 +95,6 @@ fn_update_mta_localbuild(){ fn_print_ok "Checking for update: ${remotelocation}: checking local build" fn_script_log_pass "Checking local build" fi - sleep 0.5 } fn_update_mta_remotebuild(){ @@ -111,7 +105,6 @@ fn_update_mta_remotebuild(){ remotebuild="${majorversion}.${minorversion}.${maintenanceversion}" if [ "${installer}" != "1" ]; then fn_print_dots "Checking for update: ${remotelocation}: checking remote build" - sleep 0.5 # Checks if remotebuild variable has been set. if [ -z "${remotebuild}" ]||[ "${remotebuild}" == "null" ]; then fn_print_fail "Checking for update: ${remotelocation}: checking remote build" @@ -120,7 +113,6 @@ fn_update_mta_remotebuild(){ else fn_print_ok "Checking for update: ${remotelocation}: checking remote build" fn_script_log_pass "Checking remote build" - sleep 0.5 fi else # Checks if remotebuild variable has been set. @@ -135,7 +127,6 @@ fn_update_mta_remotebuild(){ fn_update_mta_compare(){ # Removes dots so if statement can compare version numbers. fn_print_dots "Checking for update: ${remotelocation}" - sleep 0.5 localbuilddigit=$(echo "${localbuild}" | tr -cd '[:digit:]') remotebuilddigit=$(echo "${remotebuild}" | tr -cd '[:digit:]') if [ "${localbuilddigit}" -ne "${remotebuilddigit}" ]||[ "${forceupdate}" == "1" ]; then @@ -146,7 +137,6 @@ fn_update_mta_compare(){ else mtaupdatestatus="available" fi - sleep 0.5 echo -en "\n" echo -e "Update ${mtaupdatestatus}:" echo -e "* Local build: ${red}${localbuild}${default}" @@ -155,7 +145,7 @@ fn_update_mta_compare(){ fn_script_log_info "Local build: ${localbuild}" fn_script_log_info "Remote build: ${remotebuild}" fn_script_log_info "${localbuild} > ${remotebuild}" - sleep 0.5 + fn_sleep_time echo -en "\n" echo -en "applying update.\r" sleep 1 @@ -189,7 +179,6 @@ fn_update_mta_compare(){ alert.sh else fn_print_ok_nl "Checking for update: ${remotelocation}" - sleep 0.5 echo -en "\n" echo -e "No update available" echo -e "* Local build: ${green}${localbuild}${default}" @@ -209,7 +198,6 @@ if [ "${installer}" == "1" ]; then else fn_print_dots "Checking for update: ${remotelocation}" fn_script_log_info "Checking for update: ${remotelocation}" - sleep 0.5 fn_update_mta_localbuild fn_update_mta_remotebuild fn_update_mta_compare diff --git a/lgsm/functions/update_mumble.sh b/lgsm/functions/update_mumble.sh index ba98449e2..eb0bdcda3 100644 --- a/lgsm/functions/update_mumble.sh +++ b/lgsm/functions/update_mumble.sh @@ -28,7 +28,6 @@ fn_update_mumble_dl(){ fn_update_mumble_localbuild(){ # Gets local build info. fn_print_dots "Checking for update: ${remotelocation}: checking local build" - sleep 0.5 # Uses executable to find local build. cd "${executabledir}" || exit if [ -f "${executable}" ]; then @@ -40,7 +39,6 @@ fn_update_mumble_localbuild(){ fn_print_error "Checking for update: ${remotelocation}: checking local build" fn_script_log_error "Checking local build" fi - sleep 0.5 } fn_update_mumble_remotebuild(){ @@ -48,7 +46,6 @@ fn_update_mumble_remotebuild(){ remotebuild=$(${curlpath} -s "https://api.github.com/repos/mumble-voip/mumble/releases/latest" | grep 'murmur-static_x86.*\.bz2"' | tail -1 | awk -F"/" '{ print $8 }') if [ "${installer}" != "1" ]; then fn_print_dots "Checking for update: ${remotelocation}: checking remote build" - sleep 0.5 # Checks if remotebuild variable has been set. if [ -z "${remotebuild}" ]||[ "${remotebuild}" == "null" ]; then fn_print_fail "Checking for update: ${remotelocation}: checking remote build" @@ -57,7 +54,6 @@ fn_update_mumble_remotebuild(){ else fn_print_ok "Checking for update: ${remotelocation}: checking remote build" fn_script_log_pass "Checking remote build" - sleep 0.5 fi else # Checks if remotebuild variable has been set. @@ -66,18 +62,16 @@ fn_update_mumble_remotebuild(){ fn_script_log_fatal "Unable to get remote build" core_exit.sh fi - fi + fi } fn_update_mumble_compare(){ # Removes dots so if statement can compare version numbers. fn_print_dots "Checking for update: ${remotelocation}" - sleep 0.5 localbuilddigit=$(echo "${localbuild}" | tr -cd '[:digit:]') remotebuilddigit=$(echo "${remotebuild}" | tr -cd '[:digit:]') if [ "${localbuilddigit}" -ne "${remotebuilddigit}" ]||[ "${forceupdate}" == "1" ]; then fn_print_ok_nl "Checking for update: ${remotelocation}" - sleep 0.5 echo -en "\n" echo -e "Update available" echo -e "* Local build: ${red}${localbuild} ${mumblearch}${default}" @@ -86,7 +80,7 @@ fn_update_mumble_compare(){ fn_script_log_info "Local build: ${localbuild} ${mumblearch}" fn_script_log_info "Remote build: ${remotebuild} ${mumblearch}" fn_script_log_info "${localbuild} > ${remotebuild}" - sleep 0.5 + fn_sleep_time echo -en "\n" echo -en "applying update.\r" sleep 1 @@ -120,7 +114,6 @@ fn_update_mumble_compare(){ alert.sh else fn_print_ok_nl "Checking for update: ${remotelocation}" - sleep 0.5 echo -en "\n" echo -e "No update available" echo -e "* Local build: ${green}${localbuild} ${mumblearch}${default}" @@ -143,7 +136,6 @@ if [ "${installer}" == "1" ]; then else fn_print_dots "Checking for update: ${remotelocation}" fn_script_log_info "Checking for update: ${remotelocation}" - sleep 0.5 fn_update_mumble_localbuild fn_update_mumble_remotebuild fn_update_mumble_compare diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh index 9fd29eff7..7b690643d 100644 --- a/lgsm/functions/update_steamcmd.sh +++ b/lgsm/functions/update_steamcmd.sh @@ -31,7 +31,6 @@ fn_update_steamcmd_dl(){ fn_update_steamcmd_localbuild(){ # Gets local build info. fn_print_dots "Checking for update: ${remotelocation}: checking local build" - sleep 0.5 fn_appmanifest_check # Uses appmanifest to find local build. localbuild=$(grep buildid "${appmanifestfile}" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\ -f3) @@ -48,7 +47,7 @@ fn_update_steamcmd_localbuild(){ else branchname="public" fi - sleep 0.5 + fn_sleep_time } fn_update_steamcmd_remotebuild(){ @@ -57,7 +56,6 @@ fn_update_steamcmd_remotebuild(){ 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 [ "${installer}" != "1" ]; then fn_print_dots "Checking for update: ${remotelocation}: checking remote build" - sleep 0.5 # Checks if remotebuild variable has been set. if [ -z "${remotebuild}" ]||[ "${remotebuild}" == "null" ]; then fn_print_fail "Checking for update: ${remotelocation}: checking remote build" @@ -66,7 +64,6 @@ fn_update_steamcmd_remotebuild(){ else fn_print_ok "Checking for update: ${remotelocation}: checking remote build" fn_script_log_pass "Checking remote build" - sleep 0.5 fi else # Checks if remotebuild variable has been set. @@ -80,10 +77,8 @@ fn_update_steamcmd_remotebuild(){ fn_update_steamcmd_compare(){ fn_print_dots "Checking for update: ${remotelocation}" - sleep 0.5 if [ "${localbuild}" != "${remotebuild}" ]; then fn_print_ok_nl "Checking for update: ${remotelocation}" - sleep 0.5 echo -en "\n" echo -e "Update available" echo -e "* Local build: ${red}${localbuild}${default}" @@ -99,7 +94,7 @@ fn_update_steamcmd_compare(){ fn_script_log_info "Branch: ${branch}" fi fn_script_log_info "${localbuild} > ${remotebuild}" - sleep 0.5 + fn_sleep_time echo -en "\n" echo -en "applying update.\r" sleep 1 @@ -128,7 +123,6 @@ fn_update_steamcmd_compare(){ alert.sh else fn_print_ok_nl "Checking for update: ${remotelocation}" - sleep 0.5 echo -en "\n" echo -e "No update available" echo -e "* Local build: ${green}${localbuild}${default}" @@ -156,22 +150,18 @@ fn_appmanifest_check(){ # Multiple or no matching appmanifest files may sometimes be present. # This error is corrected if required. if [ "${appmanifestfilewc}" -ge "2" ]; then - sleep 0.5 + fn_sleep_time fn_print_error "Multiple appmanifest_${appid}.acf files found" fn_script_log_error "Multiple appmanifest_${appid}.acf files found" - sleep 2 fn_print_dots "Removing x${appmanifestfilewc} appmanifest_${appid}.acf files" - sleep 0.5 for appfile in ${appmanifestfile}; do rm "${appfile}" done - sleep 0.5 appmanifestfilewc1="${appmanifestfilewc}" fn_appmanifest_info if [ "${appmanifestfilewc}" -ge "2" ]; then fn_print_fail "Unable to remove x${appmanifestfilewc} appmanifest_${appid}.acf files" fn_script_log_fatal "Unable to remove x${appmanifestfilewc} appmanifest_${appid}.acf files" - sleep 0.5 echo " * Check user permissions" for appfile in ${appmanifestfile}; do echo " ${appfile}" @@ -180,19 +170,15 @@ fn_appmanifest_check(){ else fn_print_ok "Removed x${appmanifestfilewc1} appmanifest_${appid}.acf files" fn_script_log_pass "Removed x${appmanifestfilewc1} appmanifest_${appid}.acf files" - sleep 0.5 fn_print_info_nl "Forcing update to correct issue" fn_script_log_info "Forcing update to correct issue" - sleep 0.5 fn_update_steamcmd_dl fi elif [ "${appmanifestfilewc}" -eq "0" ]; then fn_print_error_nl "No appmanifest_${appid}.acf found" fn_script_log_error "No appmanifest_${appid}.acf found" - sleep 0.5 fn_print_info_nl "Forcing update to correct issue" fn_script_log_info "Forcing update to correct issue" - sleep 0.5 fn_update_steamcmd_dl fn_appmanifest_info if [ "${appmanifestfilewc}" -eq "0" ]; then diff --git a/lgsm/functions/update_ts3.sh b/lgsm/functions/update_ts3.sh index e64bd8f3a..31a015e6e 100644 --- a/lgsm/functions/update_ts3.sh +++ b/lgsm/functions/update_ts3.sh @@ -33,18 +33,15 @@ fn_update_ts3_dl(){ fn_update_ts3_localbuild(){ # Gets local build info. fn_print_dots "Checking for update: ${remotelocation}: checking local build" - sleep 0.5 + fn_sleep_time # Uses log file to gather info. # Gives time for log file to generate. if [ ! -d "${serverfiles}/logs" ]||[ -z "$(find "${serverfiles}/logs/"* -name 'ts3server*_0.log' 2> /dev/null)" ]; then fn_print_error "Checking for update: ${remotelocation}: checking local build" - sleep 0.5 fn_print_error_nl "Checking for update: ${remotelocation}: checking local build: no log files" fn_script_log_error "No log file found" - sleep 0.5 fn_print_info_nl "Checking for update: ${remotelocation}: checking local build: forcing server restart" fn_script_log_info "Forcing server restart" - sleep 0.5 exitbypass=1 command_stop.sh exitbypass=1 @@ -64,9 +61,8 @@ fn_update_ts3_localbuild(){ fn_print_error "Checking for update: ${remotelocation}: waiting for log file: missing log file" fn_script_log_error "Missing log file" fn_script_log_error "Set localbuild to 0" - sleep 0.5 fi - + totalseconds=$((totalseconds + 1)) done fi @@ -84,7 +80,7 @@ fn_update_ts3_localbuild(){ if [ -z "${loopignore}" ]; then loopignore=1 fn_script_log_info "Waiting for local build to generate" - fi + fi localbuild=$(cat $(find ./* -name "ts3server*_0.log" 2> /dev/null | sort | tail -1) | grep -Eo "TeamSpeak 3 Server ((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}" | grep -Eo "((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}") if [ "${localbuild}" ]; then break @@ -93,7 +89,7 @@ fn_update_ts3_localbuild(){ totalseconds=$((totalseconds + 1)) done fi - + if [ -z "${localbuild}" ]; then localbuild="0" fn_print_error "Checking for update: ${remotelocation}: waiting for local build: missing local build info" @@ -103,7 +99,6 @@ fn_update_ts3_localbuild(){ fn_print_ok "Checking for update: ${remotelocation}: checking local build" fn_script_log_pass "Checking local build" fi - sleep 0.5 } fn_update_ts3_remotebuild(){ @@ -115,7 +110,6 @@ fn_update_ts3_remotebuild(){ fi if [ "${installer}" != "1" ]; then fn_print_dots "Checking for update: ${remotelocation}: checking remote build" - sleep 0.5 # Checks if remotebuild variable has been set. if [ -z "${remotebuild}" ]||[ "${remotebuild}" == "null" ]; then fn_print_fail "Checking for update: ${remotelocation}: checking remote build" @@ -124,7 +118,6 @@ fn_update_ts3_remotebuild(){ else fn_print_ok "Checking for update: ${remotelocation}: checking remote build" fn_script_log_pass "Checking remote build" - sleep 0.5 fi else # Checks if remotebuild variable has been set. @@ -133,18 +126,16 @@ fn_update_ts3_remotebuild(){ fn_script_log_fatal "Unable to get remote build" core_exit.sh fi - fi + fi } fn_update_ts3_compare(){ # Removes dots so if statement can compare version numbers. fn_print_dots "Checking for update: ${remotelocation}" - sleep 0.5 localbuilddigit=$(echo "${localbuild}" | tr -cd '[:digit:]') remotebuilddigit=$(echo "${remotebuild}" | tr -cd '[:digit:]') if [ "${localbuilddigit}" -ne "${remotebuilddigit}" ]||[ "${forceupdate}" == "1" ]; then fn_print_ok_nl "Checking for update: ${remotelocation}" - sleep 0.5 echo -en "\n" echo -e "Update available" echo -e "* Local build: ${red}${localbuild}${default}" @@ -153,7 +144,7 @@ fn_update_ts3_compare(){ fn_script_log_info "Local build: ${localbuild}" fn_script_log_info "Remote build: ${remotebuild}" fn_script_log_info "${localbuild} > ${remotebuild}" - sleep 0.5 + fn_sleep_time echo -en "\n" echo -en "applying update.\r" sleep 1 @@ -187,7 +178,6 @@ fn_update_ts3_compare(){ alert.sh else fn_print_ok_nl "Checking for update: ${remotelocation}" - sleep 0.5 echo -en "\n" echo -e "No update available" echo -e "* Local build: ${green}${localbuild}${default}" @@ -219,7 +209,6 @@ if [ "${installer}" == "1" ]; then else fn_print_dots "Checking for update: ${remotelocation}" fn_script_log_info "Checking for update: ${remotelocation}" - sleep 0.5 fn_update_ts3_localbuild fn_update_ts3_remotebuild fn_update_ts3_compare diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh index 330742abb..4151a7f21 100644 --- a/tests/tests_fctrserver.sh +++ b/tests/tests_fctrserver.sh @@ -411,7 +411,6 @@ fn_setstatus(){ echo -e "\n" echo "Test starting:" echo "" - sleep 0.5 } # End of every test will expect the result to either pass or fail diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index f71d5a669..2f0103025 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -411,7 +411,6 @@ fn_setstatus(){ echo -e "\n" echo "Test starting:" echo "" - sleep 0.5 } # End of every test will expect the result to either pass or fail diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh index 9e5eb5442..6df2da2ac 100644 --- a/tests/tests_mcserver.sh +++ b/tests/tests_mcserver.sh @@ -411,7 +411,6 @@ fn_setstatus(){ echo -e "\n" echo "Test starting:" echo "" - sleep 0.5 } # End of every test will expect the result to either pass or fail @@ -797,7 +796,7 @@ echo "give time for server to fully start." echo "Command: sleep 30" requiredstatus="ONLINE" fn_setstatus -sleep 60 +sleep 30 echo "" echo "5.1 - monitor - online" diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh index 809bc2d2a..f4de2baa5 100644 --- a/tests/tests_ts3server.sh +++ b/tests/tests_ts3server.sh @@ -411,7 +411,6 @@ fn_setstatus(){ echo -e "\n" echo "Test starting:" echo "" - sleep 0.5 } # End of every test will expect the result to either pass or fail