From 6a3193194dab7a95f34a528277017cce74194f1e Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 9 Jul 2016 00:48:20 +0100 Subject: [PATCH] removed local commandaction="Checking" --- lgsm/functions/check.sh | 1 - lgsm/functions/check_config.sh | 1 - lgsm/functions/check_deps.sh | 1 - lgsm/functions/check_glibc.sh | 1 - lgsm/functions/check_ip.sh | 1 - lgsm/functions/check_logs.sh | 1 - lgsm/functions/check_permissions.sh | 1 - lgsm/functions/check_root.sh | 1 - lgsm/functions/check_status.sh | 1 - lgsm/functions/check_steamcmd.sh | 1 - lgsm/functions/check_system_dir.sh | 1 - lgsm/functions/check_tmux.sh | 1 - lgsm/functions/command_monitor.sh | 6 ++++-- lgsm/functions/command_test_alert.sh | 1 + 14 files changed, 5 insertions(+), 14 deletions(-) diff --git a/lgsm/functions/check.sh b/lgsm/functions/check.sh index a674bcd49..4b82e1cc4 100644 --- a/lgsm/functions/check.sh +++ b/lgsm/functions/check.sh @@ -7,7 +7,6 @@ # Runs checks that will either halt on or fix an issue. local commandnane="CHECK" -local commandaction="Checking" # Cannot have selfname as breaks the function. #local selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" diff --git a/lgsm/functions/check_config.sh b/lgsm/functions/check_config.sh index 1775e1f49..e1ca42706 100644 --- a/lgsm/functions/check_config.sh +++ b/lgsm/functions/check_config.sh @@ -5,7 +5,6 @@ # Description: If server config missing warn user. local commandnane="CHECK" -local commandaction="Checking" local selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" if [ ! -e "${servercfgfullpath}" ]; then diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 3c5849d45..55686446b 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -5,7 +5,6 @@ # Description: Checks that the requires dependencies are installed for LGSM. local commandnane="CHECK" -local commandaction="Checking" # Cannot have selfname as breaks the function. #local selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" diff --git a/lgsm/functions/check_glibc.sh b/lgsm/functions/check_glibc.sh index 5918bac44..70fda1f94 100644 --- a/lgsm/functions/check_glibc.sh +++ b/lgsm/functions/check_glibc.sh @@ -5,7 +5,6 @@ # Description: Checks if server has correct glibc or has a fix available. local commandnane="CHECK" -local commandaction="Checking" # Cannot have selfname as breaks the function. #local selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh index 12c94758f..e10dd793d 100644 --- a/lgsm/functions/check_ip.sh +++ b/lgsm/functions/check_ip.sh @@ -6,7 +6,6 @@ # If multiple interfaces are detected the user will need to manualy set using ip="0.0.0.0". local commandnane="CHECK" -local commandaction="Checking" local selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" if [ "${gamename}" != "Teamspeak 3" ]; then diff --git a/lgsm/functions/check_logs.sh b/lgsm/functions/check_logs.sh index d4bea2b5a..3d8e5cd40 100644 --- a/lgsm/functions/check_logs.sh +++ b/lgsm/functions/check_logs.sh @@ -5,7 +5,6 @@ # Description: Checks that log files exist on server start local commandnane="CHECK" -local commandaction="Checking" local selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" # Create dir's for the script and console logs diff --git a/lgsm/functions/check_permissions.sh b/lgsm/functions/check_permissions.sh index a88a742e9..de912b403 100644 --- a/lgsm/functions/check_permissions.sh +++ b/lgsm/functions/check_permissions.sh @@ -6,7 +6,6 @@ # Description: Checks script, files and folders ownership and permissions. local commandnane="CHECK" -local commandaction="Checking" # Cannot have selfname as breaks the function. #local selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" diff --git a/lgsm/functions/check_root.sh b/lgsm/functions/check_root.sh index eb64ddb1f..b89672cfa 100644 --- a/lgsm/functions/check_root.sh +++ b/lgsm/functions/check_root.sh @@ -4,7 +4,6 @@ # Website: https://gameservermanagers.com local commandnane="CHECK" -local commandaction="Checking" local selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" if [ $(whoami) = "root" ]; then diff --git a/lgsm/functions/check_status.sh b/lgsm/functions/check_status.sh index 41072261d..3399d07b4 100644 --- a/lgsm/functions/check_status.sh +++ b/lgsm/functions/check_status.sh @@ -5,7 +5,6 @@ # Description: Checks the proccess status of the server. Either online or offline. local commandnane="CHECK" -local commandaction="Checking" local selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" if [ "${gamename}" == "Teamspeak 3" ]; then diff --git a/lgsm/functions/check_steamcmd.sh b/lgsm/functions/check_steamcmd.sh index 01049a5aa..3b80312ab 100644 --- a/lgsm/functions/check_steamcmd.sh +++ b/lgsm/functions/check_steamcmd.sh @@ -5,7 +5,6 @@ # Description: Checks SteamCMD is installed and correct. local commandnane="CHECK" -local commandaction="Checking" # Cannot have selfname as breaks the function. #local selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" diff --git a/lgsm/functions/check_system_dir.sh b/lgsm/functions/check_system_dir.sh index be737d05a..26a4506b5 100644 --- a/lgsm/functions/check_system_dir.sh +++ b/lgsm/functions/check_system_dir.sh @@ -4,7 +4,6 @@ # Website: https://gameservermanagers.com local commandnane="CHECK" -local commandaction="Checking" local selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" if [ ! -d "${systemdir}" ]; then diff --git a/lgsm/functions/check_tmux.sh b/lgsm/functions/check_tmux.sh index 5b2fa51d9..c3680d5fa 100644 --- a/lgsm/functions/check_tmux.sh +++ b/lgsm/functions/check_tmux.sh @@ -5,7 +5,6 @@ # Description: Checks if tmux is installed as too many users do not RTFM or know how to use Google. local commandnane="CHECK" -local commandaction="Checking" local selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" if [ "$(command -v tmux)" ]||[ "$(which tmux >/dev/null 2>&1)" ]||[ -f "/usr/bin/tmux" ]||[ -f "/bin/tmux" ]; then diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh index d2a93a499..d1a155d69 100644 --- a/lgsm/functions/command_monitor.sh +++ b/lgsm/functions/command_monitor.sh @@ -80,11 +80,13 @@ fn_monitor_tmux(){ fi } +fn_print_dots "${servername}" +sleep 1 check.sh logs.sh info_config.sh -fn_print_dots "${servername}" -sleep 1 + + fn_monitor_check_lockfile fn_monitor_check_update fn_monitor_msg_checking diff --git a/lgsm/functions/command_test_alert.sh b/lgsm/functions/command_test_alert.sh index ee8f8ddf3..c9e17785c 100644 --- a/lgsm/functions/command_test_alert.sh +++ b/lgsm/functions/command_test_alert.sh @@ -9,6 +9,7 @@ local commandaction="Alert" local selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" fn_print_dots "${servername}" +sleep 1 check.sh info_config.sh alert="test"