feat: convert commandname to modulename (#2728)

5 years ago · d106384e28
105 changed files with 131 additions and 123 deletions
--- a/lgsm/functions/alert.sh
+++ b/lgsm/functions/alert.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Overall function for managing alerts.

-local commandname="ALERT"
+local modulename="ALERT"
 local commandaction="Alert"

 fn_alert_log(){
--- a/lgsm/functions/alert_discord.sh
+++ b/lgsm/functions/alert_discord.sh
@ -5,6 +5,10 @@
 # Website: https://linuxgsm.com
 # Description: Sends Discord alert.

+local modulename="ALERT"
+local commandaction="Alert"
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
+
 if ! command -v jq > /dev/null; then
 	fn_print_fail_nl "Sending Discord alert: jq is missing."
 	fn_script_log_fatal "Sending Discord alert: jq is missing."
--- a/lgsm/functions/alert_email.sh
+++ b/lgsm/functions/alert_email.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Sends email alert.

-local commandname="ALERT"
+local modulename="ALERT"
 local commandaction="Alert"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/alert_ifttt.sh
+++ b/lgsm/functions/alert_ifttt.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Sends IFTTT alert.

-local commandname="ALERT"
+local modulename="ALERT"
 local commandaction="Alert"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/alert_mailgun.sh
+++ b/lgsm/functions/alert_mailgun.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Sends Mailgun Email alert.

-local commandname="ALERT"
+local modulename="ALERT"
 local commandaction="Alert"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/alert_pushbullet.sh
+++ b/lgsm/functions/alert_pushbullet.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Sends Pushbullet Messenger alert.

-local commandname="ALERT"
+local modulename="ALERT"
 local commandaction="Alert"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/alert_pushover.sh
+++ b/lgsm/functions/alert_pushover.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Sends Pushover alert.

-local commandname="ALERT"
+local modulename="ALERT"
 local commandaction="Alert"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/alert_slack.sh
+++ b/lgsm/functions/alert_slack.sh
@ -4,6 +4,10 @@
 # Website: https://linuxgsm.com
 # Description: Sends Slack alert.

+local modulename="ALERT"
+local commandaction="Alert"
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
+
 if ! command -v jq > /dev/null; then
 	fn_print_fail_nl "Sending Slack alert: jq is missing."
 	fn_script_log_fatal "Sending Slack alert: jq is missing."
--- a/lgsm/functions/alert_telegram.sh
+++ b/lgsm/functions/alert_telegram.sh
@ -4,7 +4,7 @@
 # Website: https://bytegaming.de
 # Description: Sends Telegram Messenger alert.

-local commandname="ALERT"
+local modulename="ALERT"
 local commandaction="Alert"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/check.sh
+++ b/lgsm/functions/check.sh
@ -5,7 +5,7 @@
 # Description: Overall function for managing checks.
 # Runs checks that will either halt on or fix an issue.

-local commandname="CHECK"
+local modulename="CHECK"

 # Every command that requires checks just references check.sh.
 # check.sh selects which checks to run by using arrays.
--- a/lgsm/functions/check_config.sh
+++ b/lgsm/functions/check_config.sh
@ -4,8 +4,8 @@
 # Website: https://linuxgsm.com
 # Description: Checks if the server config is missing and warns the user if needed.

-local commandname="CHECK"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local modulename="CHECK"
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"

 if [ ! -e "${servercfgfullpath}" ]; then
 	if [ "${shortname}" != "hw" ]&&[ "${shortname}" != "ut3" ]&&[ "${shortname}" != "kf2" ]; then
--- a/lgsm/functions/check_deps.sh
+++ b/lgsm/functions/check_deps.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Checks if required dependencies are installed for LinuxGSM.

-local commandname="CHECK"
+local modulename="CHECK"

 fn_install_mono_repo(){
 	if [ "${monostatus}" != "0" ]; then
--- a/lgsm/functions/check_executable.sh
+++ b/lgsm/functions/check_executable.sh
@ -4,8 +4,8 @@
 # Website: https://linuxgsm.com
 # Description: Checks if server executable exists.

-local commandname="CHECK"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local modulename="CHECK"
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"

 # Check if executable exists
 if [ ! -f "${executabledir}/${execname}" ]; then
--- a/lgsm/functions/check_glibc.sh
+++ b/lgsm/functions/check_glibc.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Checks if the server has the correct Glibc version.

-local commandname="CHECK"
+local modulename="CHECK"

 info_distro.sh

--- a/lgsm/functions/check_ip.sh
+++ b/lgsm/functions/check_ip.sh
@ -5,7 +5,7 @@
 # Description: Automatically identifies the server interface IP.
 # If multiple interfaces are detected the user will need to manually set using ip="0.0.0.0".

-local commandname="CHECK"
+local modulename="CHECK"

 if [ "${travistest}" != "1" ]; then
 	if [ ! -f "/bin/ip" ]; then
--- a/lgsm/functions/check_logs.sh
+++ b/lgsm/functions/check_logs.sh
@ -4,8 +4,8 @@
 # Website: https://linuxgsm.com
 # Description: Checks if log files exist.

-local commandname="CHECK"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local modulename="CHECK"
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"

 fn_check_logs(){
 	fn_print_dots "Checking for log files"
--- a/lgsm/functions/check_permissions.sh
+++ b/lgsm/functions/check_permissions.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Checks ownership & permissions of scripts, files and directories.

-local commandname="CHECK"
+local modulename="CHECK"

 fn_check_ownership(){
 	if [ -f "${rootdir}/${selfname}" ]; then
--- a/lgsm/functions/check_root.sh
+++ b/lgsm/functions/check_root.sh
@ -4,8 +4,8 @@
 # Website: https://linuxgsm.com
 # Description: Checks if the user tried to run the script as root.

-local commandname="CHECK"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local modulename="CHECK"
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"

 if [ "$(whoami)" = "root" ]; then
 	if [ "${function_selfname}" != "command_install.sh" ]; then
--- a/lgsm/functions/check_status.sh
+++ b/lgsm/functions/check_status.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Checks the process status of the server. Either online or offline.

-local commandname="CHECK"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local modulename="CHECK"
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"

 status=$(tmux list-sessions -F "#{session_name}" 2>/dev/null | grep -Ecx "^${selfname}")
--- a/lgsm/functions/check_steamcmd.sh
+++ b/lgsm/functions/check_steamcmd.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Checks if SteamCMD is installed correctly.

-local commandname="CHECK"
+local modulename="CHECK"

 fn_install_steamcmd(){
 	if [ ! -d "${steamcmddir}" ]; then
--- a/lgsm/functions/check_system_dir.sh
+++ b/lgsm/functions/check_system_dir.sh
@ -4,8 +4,8 @@
 # Website: https://linuxgsm.com
 # Description: Checks if systemdir/serverfiles is accessible.

-local commandname="CHECK"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local modulename="CHECK"
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"

 if [ "${function_selfname}" != "command_validate.sh" ]; then
 	checkdir="${serverfiles}"
--- a/lgsm/functions/check_system_requirements.sh
+++ b/lgsm/functions/check_system_requirements.sh
@ -5,8 +5,8 @@
 # Website: https://linuxgsm.com
 # Description: Checks RAM requirements

-local commandname="CHECK"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local modulename="CHECK"
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"

 info_distro.sh

--- a/lgsm/functions/check_tmuxception.sh
+++ b/lgsm/functions/check_tmuxception.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Checks if run from tmux or screen

-local commandname="CHECK"
+local modulename="CHECK"

 fn_check_is_in_tmux(){
  if [ -n "${TMUX}" ]; then
--- a/lgsm/functions/command_backup.sh
+++ b/lgsm/functions/command_backup.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Creates a .tar.gz file in the backup directory.

-local commandname="BACKUP"
+local modulename="BACKUP"
 local commandaction="Backup"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_console.sh
+++ b/lgsm/functions/command_console.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Gives access to the server tmux console.

-local commandname="CONSOLE"
+local modulename="CONSOLE"
 local commandaction="Console"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_debug.sh
+++ b/lgsm/functions/command_debug.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Runs the server without tmux and directly from the terminal.

-local commandname="DEBUG"
+local modulename="DEBUG"
 local commandaction="Debug"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_details.sh
+++ b/lgsm/functions/command_details.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Displays server information.

-local commandname="DETAILS"
+local modulename="DETAILS"
 local commandaction="Details"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_dev_debug.sh
+++ b/lgsm/functions/command_dev_debug.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Dev only: Enables debugging log to be saved to dev-debug.log.

-local commandname="DEV-DEBUG"
+local modulename="DEV-DEBUG"
 local commandaction="Dev-Debug"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_dev_detect_deps.sh
+++ b/lgsm/functions/command_dev_detect_deps.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Detects dependencies the server binary requires.

-local commandname="DETECT-DEPS"
+local modulename="DETECT-DEPS"
 local commandaction="Detect-Deps"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_dev_detect_glibc.sh
+++ b/lgsm/functions/command_dev_detect_glibc.sh
@ -5,7 +5,7 @@
 # Description: Automatically detects the version of GLIBC that is required.
 # Can check a file or directory recursively.

-local commandname="DETECT-GLIBC"
+local modulename="DETECT-GLIBC"
 local commandaction="Detect-Glibc"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_dev_detect_ldd.sh
+++ b/lgsm/functions/command_dev_detect_ldd.sh
@ -5,7 +5,7 @@
 # Description: Automatically detects required deps using ldd.
 # Can check a file or directory recursively.

-local commandname="DETECT-LDD"
+local modulename="DETECT-LDD"
 local commandaction="Detect-LDD"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_dev_query_raw.sh
+++ b/lgsm/functions/command_dev_query_raw.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Raw gamedig output of the server.

-local commandname="QUERY-RAW"
+local modulename="QUERY-RAW"
 local commandaction="Query Raw"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_donate.sh
+++ b/lgsm/functions/command_donate.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Shows ways to donate.

-local commandname="CONSOLE"
+local modulename="CONSOLE"
 local commandaction="Console"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_fastdl.sh
+++ b/lgsm/functions/command_fastdl.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Creates a FastDL directory.

-local commandname="FASTDL"
+local modulename="FASTDL"
 local commandaction="FastDL"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_install.sh
+++ b/lgsm/functions/command_install.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Overall function for the installer.

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_install_resources_mta.sh
+++ b/lgsm/functions/command_install_resources_mta.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Installs the default resources for Multi Theft Auto.

-local commandname="DEFAULT_RESOURCES"
+local modulename="DEFAULT_RESOURCES"
 local commandaction="Default Resources"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_mods_install.sh
+++ b/lgsm/functions/command_mods_install.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: List and installs available mods along with mods_list.sh and mods_core.sh.

-local commandname="MODS"
+local modulename="MODS"
 local commandaction="addons/mods"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_mods_remove.sh
+++ b/lgsm/functions/command_mods_remove.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Uninstall mods along with mods_list.sh and mods_core.sh.

-local commandname="MODS"
+local modulename="MODS"
 local commandaction="Mods Remove"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_mods_update.sh
+++ b/lgsm/functions/command_mods_update.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Updates installed mods along with mods_list.sh and mods_core.sh.

-local commandname="MODS"
+local modulename="MODS"
 local commandaction="Mods Update"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_monitor.sh
+++ b/lgsm/functions/command_monitor.sh
@ -6,7 +6,7 @@
 # Description: Monitors server by checking for running processes
 # then passes to gamedig and gsquery.

-local commandname="MONITOR"
+local modulename="MONITOR"
 local commandaction="Monitor"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_postdetails.sh
+++ b/lgsm/functions/command_postdetails.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Strips sensitive information out of Details output

-local commandname="POSTDETAILS"
+local modulename="POSTDETAILS"
 local commandaction="Postdetails"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_restart.sh
+++ b/lgsm/functions/command_restart.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Restarts the server.

-local commandname="RESTART"
+local modulename="RESTART"
 local commandaction="Restarting"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_start.sh
+++ b/lgsm/functions/command_start.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Starts the server.

-local commandname="START"
+local modulename="START"
 local commandaction="Starting"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_stop.sh
+++ b/lgsm/functions/command_stop.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Stops the server.

-local commandname="STOP"
+local modulename="STOP"
 local commandaction="Stopping"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_test_alert.sh
+++ b/lgsm/functions/command_test_alert.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Sends a test alert.

-local commandname="ALERT"
+local modulename="ALERT"
 local commandaction="Alert"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_ts3_server_pass.sh
+++ b/lgsm/functions/command_ts3_server_pass.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Changes TS3 serveradmin password.

-local commandname="PASSWORD-CHANGE"
+local modulename="PASSWORD-CHANGE"
 local commandaction="Password Change"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_update.sh
+++ b/lgsm/functions/command_update.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Handles updating of servers.

-local commandname="UPDATE"
+local modulename="UPDATE"
 local commandaction="Update"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_update_linuxgsm.sh
+++ b/lgsm/functions/command_update_linuxgsm.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Deletes the functions dir to allow re-downloading of functions from GitHub.

-local commandname="UPDATE LINUXGSM"
+local modulename="UPDATE LINUXGSM"
 local commandaction="Update LinuxGSM"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_validate.sh
+++ b/lgsm/functions/command_validate.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Runs a server validation.

-local commandname="VALIDATE"
+local modulename="VALIDATE"
 local commandaction="Validate"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/command_wipe.sh
+++ b/lgsm/functions/command_wipe.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Wipes server data, useful after updates for some games like Rust

-local commandname="WIPE"
+local modulename="WIPE"
 local commandaction="Wipe"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/core_dl.sh
+++ b/lgsm/functions/core_dl.sh
@ -17,7 +17,7 @@
 # fn_fetch_file "${remote_fileurl}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${md5}"
 # fn_fetch_file "http://example.com/file.tar.bz2" "/some/dir" "file.tar.bz2" "chmodx" "run" "forcedl" "10cd7353aa9d758a075c600a6dd193fd"

-local commandname="DOWNLOAD"
+local modulename="DOWNLOAD"
 local commandaction="Download"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/core_messages.sh
+++ b/lgsm/functions/core_messages.sh
@ -46,8 +46,8 @@ fn_sleep_time(){
 ## Feb 28 14:56:58 ut99-server: Monitor:
 fn_script_log(){
 	if [ -d "${lgsmlogdir}" ]; then
-		if [ -n "${commandname}" ]; then
-			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${commandname}: ${1}" >> "${lgsmlog}"
+		if [ -n "${modulename}" ]; then
+			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${servicename}: ${modulename}: ${1}" >> "${lgsmlog}"
 		else
 			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${1}" >> "${lgsmlog}"
 		fi
@ -57,8 +57,8 @@ fn_script_log(){
 ## Feb 28 14:56:58 ut99-server: Monitor: PASS:
 fn_script_log_pass(){
 	if [ -d "${lgsmlogdir}" ]; then
-		if [ -n "${commandname}" ]; then
-			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${commandname}: PASS: ${1}" >> "${lgsmlog}"
+		if [ -n "${modulename}" ]; then
+			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${servicename}: ${modulename}: PASS: ${1}" >> "${lgsmlog}"
 		else
 			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: PASS: ${1}" >> "${lgsmlog}"
 		fi
@ -69,8 +69,8 @@ fn_script_log_pass(){
 ## Feb 28 14:56:58 ut99-server: Monitor: FATAL:
 fn_script_log_fatal(){
 	if [ -d "${lgsmlogdir}" ]; then
-		if [ -n "${commandname}" ]; then
-			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${commandname}: FATAL: ${1}" >> "${lgsmlog}"
+		if [ -n "${modulename}" ]; then
+			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${servicename}: ${modulename}: FATAL: ${1}" >> "${lgsmlog}"
 		else
 			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: FATAL: ${1}" >> "${lgsmlog}"
 		fi
@ -81,8 +81,8 @@ fn_script_log_fatal(){
 ## Feb 28 14:56:58 ut99-server: Monitor: ERROR:
 fn_script_log_error(){
 	if [ -d "${lgsmlogdir}" ]; then
-		if [ -n "${commandname}" ]; then
-			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${commandname}: ERROR: ${1}" >> "${lgsmlog}"
+		if [ -n "${modulename}" ]; then
+			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${servicename}: ${modulename}: ERROR: ${1}" >> "${lgsmlog}"
 		else
 			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ERROR: ${1}" >> "${lgsmlog}"
 		fi
@ -93,8 +93,8 @@ fn_script_log_error(){
 ## Feb 28 14:56:58 ut99-server: Monitor: WARN:
 fn_script_log_warn(){
 	if [ -d "${lgsmlogdir}" ]; then
-		if [ -n "${commandname}" ]; then
-			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${commandname}: WARN: ${1}" >> "${lgsmlog}"
+		if [ -n "${modulename}" ]; then
+			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${servicename}: ${modulename}: WARN: ${1}" >> "${lgsmlog}"
 		else
 			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: WARN: ${1}" >> "${lgsmlog}"
 		fi
@ -105,8 +105,8 @@ fn_script_log_warn(){
 ## Feb 28 14:56:58 ut99-server: Monitor: INFO:
 fn_script_log_info(){
 	if [ -d "${lgsmlogdir}" ]; then
-		if [ -n "${commandname}" ]; then
-			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${commandname}: INFO: ${1}" >> "${lgsmlog}"
+		if [ -n "${modulename}" ]; then
+			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${servicename}: ${modulename}: INFO: ${1}" >> "${lgsmlog}"
 		else
 			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: INFO: ${1}" >> "${lgsmlog}"
 		fi
--- a/lgsm/functions/fix.sh
+++ b/lgsm/functions/fix.sh
@ -5,7 +5,7 @@
 # Description: Overall function for managing fixes.
 # Runs functions that will fix an issue.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"

 # Messages that are displayed for some fixes.
--- a/lgsm/functions/fix_arma3.sh
+++ b/lgsm/functions/fix_arma3.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves an issue with ARMA3.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/fix_csgo.sh
+++ b/lgsm/functions/fix_csgo.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with CS:GO.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/fix_dst.sh
+++ b/lgsm/functions/fix_dst.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with Don't Starve Together.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/fix_ges.sh
+++ b/lgsm/functions/fix_ges.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with GoldenEye: Source.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"

 # Fixes: MALLOC_CHECK_ needing to be set to 0.
--- a/lgsm/functions/fix_ins.sh
+++ b/lgsm/functions/fix_ins.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with Insurgency.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"

 # Fixes: ./srcds_linux: error while loading shared libraries: libtier0.so: cannot open shared object file: No such file or directory.
--- a/lgsm/functions/fix_kf.sh
+++ b/lgsm/functions/fix_kf.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with Killing Floor.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/fix_kf2.sh
+++ b/lgsm/functions/fix_kf2.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with Killing Floor 2.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/fix_mcb.sh
+++ b/lgsm/functions/fix_mcb.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves possible startup issue with Minecraft Bedrock

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"

 # official docs state that the server should be started with: LD_LIBRARY_PATH=. ./bedrock_server
--- a/lgsm/functions/fix_mta.sh
+++ b/lgsm/functions/fix_mta.sh
@ -4,7 +4,7 @@
 # Contributor: ChaosMTA
 # Website: https://linuxgsm.com
 # Description: Installs the libmysqlclient for database functions on the server
-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/fix_onset.sh
+++ b/lgsm/functions/fix_onset.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with Onset

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/fix_ro.sh
+++ b/lgsm/functions/fix_ro.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with Red Orchestra.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/fix_rust.sh
+++ b/lgsm/functions/fix_rust.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves startup issue with Rust

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"

 # Fixes: [Raknet] Server Shutting Down (Shutting Down).
--- a/lgsm/functions/fix_rw.sh
+++ b/lgsm/functions/fix_rw.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves startup issue with Rising World

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"

 export LD_LIBRARY_PATH="${serverfiles}/linux64:${serverfiles}:$LD_LIBRARY_PATH"
--- a/lgsm/functions/fix_sdtd.sh
+++ b/lgsm/functions/fix_sdtd.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves startup issue with 7 Days to Die

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"

 export LD_LIBRARY_PATH="${serverfiles}"
--- a/lgsm/functions/fix_sfc.sh
+++ b/lgsm/functions/fix_sfc.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with Source Forts Classic.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/fix_sof2.sh
+++ b/lgsm/functions/fix_sof2.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves startup issue with Soldier of Fortune 2

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"

 # Fixes: error while loading shared libraries: libcxa.so.1
--- a/lgsm/functions/fix_ss3.sh
+++ b/lgsm/functions/fix_ss3.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with Serious Sam 3.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/fix_steamcmd.sh
+++ b/lgsm/functions/fix_steamcmd.sh
@ -4,9 +4,9 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues related to SteamCMD.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"

 # Fixes: [S_API FAIL] SteamAPI_Init() failed; unable to locate a running instance of Steam,or a local steamclient.so.
 if [ ! -f "${HOME}/.steam/sdk32/steamclient.so" ]; then
--- a/lgsm/functions/fix_terraria.sh
+++ b/lgsm/functions/fix_terraria.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves an issue with Terraria.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/fix_tf2.sh
+++ b/lgsm/functions/fix_tf2.sh
@ -4,7 +4,7 @@
 # Website: https://github.com/vectorsigma
 # Description: Resolves various issues with Team Fortress 2.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/fix_ts3.sh
+++ b/lgsm/functions/fix_ts3.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with Teamspeak 3.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/fix_unt.sh
+++ b/lgsm/functions/fix_unt.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves startup issue with Unturned

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"

 # steamclient.so: cannot open shared object file: No such file or directory
--- a/lgsm/functions/fix_ut.sh
+++ b/lgsm/functions/fix_ut.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with Unreal Tournament.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/fix_ut2k4.sh
+++ b/lgsm/functions/fix_ut2k4.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with Unreal Tournament 2004.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/fix_ut3.sh
+++ b/lgsm/functions/fix_ut3.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with configs in Unreal Tournament 3.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/fix_zmr.sh
+++ b/lgsm/functions/fix_zmr.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with Zombie Master: Reborn.

-local commandname="FIX"
+local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/install_complete.sh
+++ b/lgsm/functions/install_complete.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Prints installation completion message and hints.

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/install_config.sh
+++ b/lgsm/functions/install_config.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Creates default server configs.

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/install_dst_token.sh
+++ b/lgsm/functions/install_dst_token.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Configures Don't Starve Together cluster with given token.

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/install_factorio_save.sh
+++ b/lgsm/functions/install_factorio_save.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Creates the initial save file for Factorio

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"

 echo -e ""
--- a/lgsm/functions/install_gslt.sh
+++ b/lgsm/functions/install_gslt.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Configures GSLT.

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/install_header.sh
+++ b/lgsm/functions/install_header.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Prints installation header.

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/install_logs.sh
+++ b/lgsm/functions/install_logs.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Creates log directories.

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/install_mta_resources.sh
+++ b/lgsm/functions/install_mta_resources.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Installs the libmysqlclient for database functions on the server and optionally installs default resources required to run the server

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/install_retry.sh
+++ b/lgsm/functions/install_retry.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Asks for installation retry after failure.

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/install_server_dir.sh
+++ b/lgsm/functions/install_server_dir.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Creates the server directory.

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/install_server_files.sh
+++ b/lgsm/functions/install_server_files.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Installs server files.

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/install_squad_license.sh
+++ b/lgsm/functions/install_squad_license.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Configures the Squad server's license.

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/install_stats.sh
+++ b/lgsm/functions/install_stats.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Enabled LinuxGSM Stats.

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/install_steamcmd.sh
+++ b/lgsm/functions/install_steamcmd.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Downloads SteamCMD on install.

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"

 echo -e ""
--- a/lgsm/functions/install_ts3db.sh
+++ b/lgsm/functions/install_ts3db.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Installs the database server MariaDB for TeamSpeak 3.

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/install_ut2k4_key.sh
+++ b/lgsm/functions/install_ut2k4_key.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Activates ut2k4 server with given key.

-local commandname="INSTALL"
+local modulename="INSTALL"
 local commandaction="Install"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/logs.sh
+++ b/lgsm/functions/logs.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Acts as a log rotator, removing old logs.

-local commandname="LOGS"
+local modulename="LOGS"
 local commandaction="Log-Manager"

 # Check if logfile variable and file exist, create logfile if it doesn't exist.
--- a/lgsm/functions/mods_core.sh
+++ b/lgsm/functions/mods_core.sh
@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Core functions for mods list/install/update/remove

-local commandname="MODS"
+local modulename="MODS"
 local commandaction="Mods"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/mods_list.sh
+++ b/lgsm/functions/mods_list.sh
@ -8,7 +8,7 @@
 # Usage: Then add this array to the mods_global_array.
 # Usage: If needed, you can scrape the download URL first.

-local commandname="MODS"
+local modulename="MODS"
 local commandaction="List Mods"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/update_factorio.sh
+++ b/lgsm/functions/update_factorio.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Handles updating of Factorio servers.

-local commandname="UPDATE"
+local modulename="UPDATE"
 local commandaction="Update"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")

--- a/lgsm/functions/update_minecraft.sh
+++ b/lgsm/functions/update_minecraft.sh
@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: Handles updating of Minecraft servers.

-local commandname="UPDATE"
+local modulename="UPDATE"
 local commandaction="Update"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")