diff --git a/lgsm/functions/alert_email.sh b/lgsm/functions/alert_email.sh index 3f29219e1..716cc84a6 100644 --- a/lgsm/functions/alert_email.sh +++ b/lgsm/functions/alert_email.sh @@ -6,7 +6,7 @@ lgsm_version="210516" # Description: Sends email alert if monitor picks up a failure. -local modulename="Alert" +modulename="Alert" fn_details_email(){ diff --git a/lgsm/functions/alert_pushbullet.sh b/lgsm/functions/alert_pushbullet.sh index 10a704190..bca8e2547 100644 --- a/lgsm/functions/alert_pushbullet.sh +++ b/lgsm/functions/alert_pushbullet.sh @@ -6,7 +6,7 @@ lgsm_version="210516" # Description: alerts using pushbullet. -local modulename="Alert" +modulename="Alert" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" fn_print_dots "Sending Pushbullet alert" sleep 1 diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index a9f8f74eb..71264b5c9 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -6,7 +6,7 @@ lgsm_version="210516" # Description: Creates a .tar.gz file in the backup directory. -local modulename="Backup" +modulename="Backup" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh diff --git a/lgsm/functions/command_console.sh b/lgsm/functions/command_console.sh index e12234f9d..5e23788d7 100644 --- a/lgsm/functions/command_console.sh +++ b/lgsm/functions/command_console.sh @@ -6,7 +6,7 @@ lgsm_version="210516" # Description: Gives access to the server tmux console. -local modulename="Console" +modulename="Console" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh diff --git a/lgsm/functions/command_debug.sh b/lgsm/functions/command_debug.sh index 655c0607a..73333eb4e 100644 --- a/lgsm/functions/command_debug.sh +++ b/lgsm/functions/command_debug.sh @@ -6,7 +6,7 @@ lgsm_version="210516" # Description: Runs the server without tmux. Runs direct from the terminal. -local modulename="Debug" +modulename="Debug" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" # Trap to remove lockfile on quit. diff --git a/lgsm/functions/command_dev_detect_deps.sh b/lgsm/functions/command_dev_detect_deps.sh index a80fdb4c9..c9cb3cf9f 100644 --- a/lgsm/functions/command_dev_detect_deps.sh +++ b/lgsm/functions/command_dev_detect_deps.sh @@ -6,7 +6,7 @@ lgsm_version="210516" # Description: Detects dependencies the server binary requires. -local modulename="Backup" +modulename="Backup" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh diff --git a/lgsm/functions/command_fastdl.sh b/lgsm/functions/command_fastdl.sh index 2a11050c4..a962912c0 100644 --- a/lgsm/functions/command_fastdl.sh +++ b/lgsm/functions/command_fastdl.sh @@ -7,7 +7,7 @@ lgsm_version="060616" # Description: Creates a FastDL folder -local modulename="FastDL" +modulename="FastDL" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh diff --git a/lgsm/functions/command_install.sh b/lgsm/functions/command_install.sh index fbf209b81..e0fbad091 100644 --- a/lgsm/functions/command_install.sh +++ b/lgsm/functions/command_install.sh @@ -6,7 +6,7 @@ lgsm_version="210516" # Description: Overall function for the installer. -local modulename="Install" +modulename="Install" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh index c903b463c..50b23677f 100644 --- a/lgsm/functions/command_monitor.sh +++ b/lgsm/functions/command_monitor.sh @@ -7,7 +7,7 @@ lgsm_version="210516" # Description: Monitors server by checking for running proccesses # then passes to monitor_gsquery.sh. -local modulename="Monitor" +modulename="Monitor" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" fn_monitor_check_lockfile(){ diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh index 9dbdca200..d957c31c6 100644 --- a/lgsm/functions/command_start.sh +++ b/lgsm/functions/command_start.sh @@ -6,7 +6,7 @@ lgsm_version="210516" # Description: Starts the server. -local modulename="Starting" +modulename="Starting" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" fn_start_teamspeak3(){ diff --git a/lgsm/functions/command_stop.sh b/lgsm/functions/command_stop.sh index a24833bbf..dd75fcf28 100644 --- a/lgsm/functions/command_stop.sh +++ b/lgsm/functions/command_stop.sh @@ -6,7 +6,7 @@ lgsm_version="050616" # Description: Stops the server. -local modulename="Stopping" +modulename="Stopping" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" # Attempts Graceful of source using rcon 'quit' command. diff --git a/lgsm/functions/command_test_alert.sh b/lgsm/functions/command_test_alert.sh index c1c105a01..9fd6eedef 100644 --- a/lgsm/functions/command_test_alert.sh +++ b/lgsm/functions/command_test_alert.sh @@ -6,7 +6,7 @@ lgsm_version="210516" # Description: Sends a test email alert. -local modulename="Alert" +modulename="Alert" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh index 2ec6d52d8..023b32c2d 100644 --- a/lgsm/functions/command_ts3_server_pass.sh +++ b/lgsm/functions/command_ts3_server_pass.sh @@ -7,7 +7,7 @@ lgsm_version="210516" # Description: Changes TS3 serveradmin password -local modulename="Change password" +modulename="Change password" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" diff --git a/lgsm/functions/command_validate.sh b/lgsm/functions/command_validate.sh index 9826b6b7f..50c4aa975 100644 --- a/lgsm/functions/command_validate.sh +++ b/lgsm/functions/command_validate.sh @@ -6,7 +6,7 @@ lgsm_version="210516" # Description: Runs a server validation. -local modulename="Validate" +modulename="Validate" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" fn_validation(){ diff --git a/lgsm/functions/core_exit.sh b/lgsm/functions/core_exit.sh index 9704b0115..6e59918ec 100644 --- a/lgsm/functions/core_exit.sh +++ b/lgsm/functions/core_exit.sh @@ -23,5 +23,5 @@ fi if [ -f "${rootdir}/.dev-debug" ]; then sleep 0.5 - echo "Exiting with code: ${exitcode}" + echo "${modulename} Exiting with code: ${exitcode}" fi \ No newline at end of file diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh index 1adeb7f81..8e97962a1 100644 --- a/lgsm/functions/core_functions.sh +++ b/lgsm/functions/core_functions.sh @@ -157,7 +157,7 @@ fn_fetch_function } fn_restart(){ -local modulename="Restarting" +modulename="Restarting" info_config.sh command_stop.sh command_start.sh diff --git a/lgsm/functions/install_complete.sh b/lgsm/functions/install_complete.sh index 6f9c9c8fa..bf61286ae 100644 --- a/lgsm/functions/install_complete.sh +++ b/lgsm/functions/install_complete.sh @@ -4,7 +4,7 @@ # Website: https://gameservermanagers.com lgsm_version="210516" -local modulename="Install" +modulename="Install" if [ "${gamename}" == "Don't Starve Together" ]; then echo "" diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index d19eaeddd..57c387af2 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -4,7 +4,7 @@ # Website: https://gameservermanagers.com lgsm_version="210516" -local modulename="Install" +modulename="Install" fn_defaultconfig(){ echo "creating ${servercfg} config file." diff --git a/lgsm/functions/install_gslt.sh b/lgsm/functions/install_gslt.sh index f7dc596ef..38edd9f68 100644 --- a/lgsm/functions/install_gslt.sh +++ b/lgsm/functions/install_gslt.sh @@ -6,7 +6,7 @@ lgsm_version="210516" # Description: Configures GSLT. -local modulename="Install" +modulename="Install" echo "" echo "Game Server Login Token" diff --git a/lgsm/functions/install_header.sh b/lgsm/functions/install_header.sh index 96c56a209..e0a5047cb 100644 --- a/lgsm/functions/install_header.sh +++ b/lgsm/functions/install_header.sh @@ -4,7 +4,7 @@ # Website: https://gameservermanagers.com lgsm_version="210516" -local modulename="Install" +modulename="Install" clear echo "=================================" diff --git a/lgsm/functions/install_logs.sh b/lgsm/functions/install_logs.sh index e077ee8ab..3dd932824 100644 --- a/lgsm/functions/install_logs.sh +++ b/lgsm/functions/install_logs.sh @@ -4,7 +4,7 @@ # Website: https://gameservermanagers.com lgsm_version="210516" -local modulename="Install" +modulename="Install" if [ "${checklogs}" != "1" ]; then echo "" diff --git a/lgsm/functions/install_retry.sh b/lgsm/functions/install_retry.sh index 80df1a6ba..1d5dc5471 100644 --- a/lgsm/functions/install_retry.sh +++ b/lgsm/functions/install_retry.sh @@ -4,7 +4,7 @@ # Website: https://gameservermanagers.com lgsm_version="210516" -local modulename="Install" +modulename="Install" while true; do read -e -i "y" -p "Retry install? [Y/n]" yn diff --git a/lgsm/functions/install_server_dir.sh b/lgsm/functions/install_server_dir.sh index c9aabc829..8d50f91ff 100644 --- a/lgsm/functions/install_server_dir.sh +++ b/lgsm/functions/install_server_dir.sh @@ -4,7 +4,7 @@ # Website: https://gameservermanagers.com lgsm_version="210516" -local modulename="Install" +modulename="Install" echo "" echo "Server Directory" diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 2438b1c01..e0ba0fb22 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -4,7 +4,7 @@ # Website: https://gameservermanagers.com lgsm_version="270516" -local modulename="Install" +modulename="Install" fn_install_server_files(){ if [ "${gamename}" == "Unreal Tournament 99" ]; then diff --git a/lgsm/functions/install_steamcmd.sh b/lgsm/functions/install_steamcmd.sh index 7c733d289..b9384b5ea 100644 --- a/lgsm/functions/install_steamcmd.sh +++ b/lgsm/functions/install_steamcmd.sh @@ -6,7 +6,7 @@ lgsm_version="210516" # Description: Downloads SteamCMD on install. -local modulename="Install" +modulename="Install" echo "" echo "Installing SteamCMD" diff --git a/lgsm/functions/install_ts3.sh b/lgsm/functions/install_ts3.sh index 44d2b4231..4c0c439cf 100644 --- a/lgsm/functions/install_ts3.sh +++ b/lgsm/functions/install_ts3.sh @@ -4,7 +4,7 @@ # Website: https://gameservermanagers.com lgsm_version="210516" -local modulename="Install" +modulename="Install" info_distro.sh # Gets the teamspeak server architecture diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh index e2027a42b..15ac644dd 100644 --- a/lgsm/functions/install_ts3db.sh +++ b/lgsm/functions/install_ts3db.sh @@ -5,7 +5,7 @@ # Website: https://gameservermanagers.com lgsm_version="210516" -local modulename="Install" +modulename="Install" fn_install_ts3db_mariadb(){ echo "" diff --git a/lgsm/functions/install_ut2k4_key.sh b/lgsm/functions/install_ut2k4_key.sh index 212cfba25..1b14bdeea 100644 --- a/lgsm/functions/install_ut2k4_key.sh +++ b/lgsm/functions/install_ut2k4_key.sh @@ -4,7 +4,7 @@ # Website: https://gameservermanagers.com lgsm_version="210516" -local modulename="Install" +modulename="Install" echo "" echo "Enter ${gamename} CD Key" diff --git a/lgsm/functions/logs.sh b/lgsm/functions/logs.sh index 03682368e..9bf33f504 100644 --- a/lgsm/functions/logs.sh +++ b/lgsm/functions/logs.sh @@ -7,7 +7,7 @@ lgsm_version="210516" # Description: Acts as a log rotater, removing old logs. -local modulename="Log Manager" +modulename="Log Manager" # Check if logfile variable and file exist, create logfile if it doesn't exist if [ -n "${consolelog}" ]; then diff --git a/lgsm/functions/monitor_gsquery.sh b/lgsm/functions/monitor_gsquery.sh index 607f3ac96..4813786a0 100644 --- a/lgsm/functions/monitor_gsquery.sh +++ b/lgsm/functions/monitor_gsquery.sh @@ -7,7 +7,7 @@ lgsm_version="210516" # Description: uses gsquery.py to query the server port. # Detects if the server has frozen with the proccess still running. -local modulename="Monitor" +modulename="Monitor" # Forces legecy servers to use gsquery if [ -z "${gsquery}" ]; then diff --git a/lgsm/functions/update_check.sh b/lgsm/functions/update_check.sh index 716889b43..ee73b1558 100644 --- a/lgsm/functions/update_check.sh +++ b/lgsm/functions/update_check.sh @@ -6,7 +6,7 @@ lgsm_version="210516" # Description: Checks if a server update is available. -local modulename="Update" +modulename="Update" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" ### SteamCMD Update Checker ### diff --git a/lgsm/functions/update_dl.sh b/lgsm/functions/update_dl.sh index 5d5fb6ced..f1332e8b9 100644 --- a/lgsm/functions/update_dl.sh +++ b/lgsm/functions/update_dl.sh @@ -6,7 +6,7 @@ lgsm_version="210516" # Description: Runs a server update. -local modulename="Update" +modulename="Update" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" fn_steamcmd_dl(){