From b30b36fd6df919c7815deca8a01bd47289838fb6 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Mon, 13 Apr 2020 12:39:50 +0100
Subject: [PATCH 1/2] fix(install): will not use apt steamcmd package if ubuntu
 14.04 (#2820)

---
 lgsm/functions/check_deps.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh
index f4499a587..a0188e9e2 100644
--- a/lgsm/functions/check_deps.sh
+++ b/lgsm/functions/check_deps.sh
@@ -349,8 +349,8 @@ fn_deps_build_debian(){
 	fi
 	# If requires steamcmd.
 	if [ "${appid}" ]; then
-		# Will not use apt if non-free repo is missing
-		if [ "${distroid}" == "debian" ]&& ! grep -qE "^deb .*non-free" /etc/apt/sources.list; then
+		# Will not use apt if non-free repo is missing or Ubuntu 14.04
+		if [ "${distroversion}" == "14.04" ]||[ "${distroid}" == "debian" ]&& ! grep -qE "^deb .*non-free" /etc/apt/sources.list; then
 			:
 		else
 			array_deps_required+=( steamcmd )

From f76cd6b26620ba8b5c086d61896925aaef880368 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Mon, 13 Apr 2020 13:13:36 +0100
Subject: [PATCH 2/2] fix(logs): resolve modulename not showing in logs (#2818)

---
 lgsm/functions/alert_email.sh                   |  2 +-
 lgsm/functions/alert_ifttt.sh                   |  2 +-
 lgsm/functions/alert_mailgun.sh                 |  2 +-
 lgsm/functions/alert_pushbullet.sh              |  2 +-
 lgsm/functions/alert_pushover.sh                |  2 +-
 lgsm/functions/alert_telegram.sh                |  2 +-
 lgsm/functions/command_backup.sh                |  2 +-
 lgsm/functions/command_console.sh               |  2 +-
 lgsm/functions/command_debug.sh                 |  2 +-
 lgsm/functions/command_details.sh               |  2 +-
 lgsm/functions/command_dev_debug.sh             |  4 ++--
 lgsm/functions/command_dev_detect_deps.sh       |  4 ++--
 lgsm/functions/command_dev_detect_glibc.sh      |  4 ++--
 lgsm/functions/command_dev_detect_ldd.sh        |  4 ++--
 lgsm/functions/command_dev_query_raw.sh         |  2 +-
 lgsm/functions/command_fastdl.sh                |  2 +-
 lgsm/functions/command_install.sh               |  2 +-
 lgsm/functions/command_install_resources_mta.sh |  2 +-
 lgsm/functions/command_mods_install.sh          |  2 +-
 lgsm/functions/command_mods_remove.sh           |  2 +-
 lgsm/functions/command_mods_update.sh           |  2 +-
 lgsm/functions/command_monitor.sh               |  2 +-
 lgsm/functions/command_postdetails.sh           |  2 +-
 lgsm/functions/command_restart.sh               |  2 +-
 lgsm/functions/command_start.sh                 |  2 +-
 lgsm/functions/command_stop.sh                  |  2 +-
 lgsm/functions/command_test_alert.sh            |  2 +-
 lgsm/functions/command_ts3_server_pass.sh       |  2 +-
 lgsm/functions/command_update.sh                |  2 +-
 lgsm/functions/command_update_linuxgsm.sh       |  2 +-
 lgsm/functions/command_validate.sh              |  2 +-
 lgsm/functions/command_wipe.sh                  |  2 +-
 lgsm/functions/compress_unreal2_maps.sh         |  2 +-
 lgsm/functions/compress_ut99_maps.sh            |  2 +-
 lgsm/functions/core_dl.sh                       |  2 +-
 lgsm/functions/core_exit.sh                     | 15 ++++++++++++++-
 lgsm/functions/core_getopt.sh                   | 15 +++++++++------
 lgsm/functions/core_messages.sh                 | 12 ++++++------
 lgsm/functions/fix_arma3.sh                     |  2 +-
 lgsm/functions/fix_csgo.sh                      |  2 +-
 lgsm/functions/fix_dst.sh                       |  2 +-
 lgsm/functions/fix_kf.sh                        |  2 +-
 lgsm/functions/fix_kf2.sh                       |  2 +-
 lgsm/functions/fix_mta.sh                       |  5 +++--
 lgsm/functions/fix_nmrih.sh                     |  5 ++++-
 lgsm/functions/fix_onset.sh                     |  2 +-
 lgsm/functions/fix_ro.sh                        |  2 +-
 lgsm/functions/fix_sfc.sh                       |  2 +-
 lgsm/functions/fix_ss3.sh                       |  2 +-
 lgsm/functions/fix_steamcmd.sh                  |  2 +-
 lgsm/functions/fix_terraria.sh                  |  2 +-
 lgsm/functions/fix_tf2.sh                       |  2 +-
 lgsm/functions/fix_ts3.sh                       |  2 +-
 lgsm/functions/fix_ut.sh                        |  2 +-
 lgsm/functions/fix_ut2k4.sh                     |  2 +-
 lgsm/functions/fix_ut3.sh                       |  2 +-
 lgsm/functions/fix_wurm.sh                      |  3 +++
 lgsm/functions/fix_zmr.sh                       |  2 +-
 lgsm/functions/info_config.sh                   |  2 +-
 lgsm/functions/info_distro.sh                   |  2 +-
 lgsm/functions/info_parms.sh                    |  2 +-
 lgsm/functions/install_complete.sh              |  2 +-
 lgsm/functions/install_config.sh                |  2 +-
 lgsm/functions/install_dst_token.sh             |  2 +-
 lgsm/functions/install_gslt.sh                  |  2 +-
 lgsm/functions/install_header.sh                |  2 +-
 lgsm/functions/install_logs.sh                  |  2 +-
 lgsm/functions/install_mta_resources.sh         |  2 +-
 lgsm/functions/install_retry.sh                 |  2 +-
 lgsm/functions/install_server_dir.sh            |  2 +-
 lgsm/functions/install_server_files.sh          |  2 +-
 lgsm/functions/install_squad_license.sh         |  2 +-
 lgsm/functions/install_stats.sh                 |  2 +-
 lgsm/functions/install_ts3db.sh                 |  2 +-
 lgsm/functions/install_ut2k4_key.sh             |  2 +-
 lgsm/functions/mods_core.sh                     |  2 +-
 lgsm/functions/mods_list.sh                     |  2 +-
 lgsm/functions/update_factorio.sh               |  2 +-
 lgsm/functions/update_minecraft.sh              |  2 +-
 lgsm/functions/update_minecraft_bedrock.sh      |  2 +-
 lgsm/functions/update_mta.sh                    |  2 +-
 lgsm/functions/update_mumble.sh                 |  2 +-
 lgsm/functions/update_steamcmd.sh               |  2 +-
 lgsm/functions/update_ts3.sh                    |  2 +-
 84 files changed, 121 insertions(+), 98 deletions(-)

diff --git a/lgsm/functions/alert_email.sh b/lgsm/functions/alert_email.sh
index 43eddfa58..398ecc3e8 100644
--- a/lgsm/functions/alert_email.sh
+++ b/lgsm/functions/alert_email.sh
@@ -6,7 +6,7 @@
 
 local modulename="ALERT"
 local commandaction="Alert"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_print_dots "Sending Email alert: ${email}"
 fn_sleep_time
diff --git a/lgsm/functions/alert_ifttt.sh b/lgsm/functions/alert_ifttt.sh
index 26a50114f..0e983e2dc 100644
--- a/lgsm/functions/alert_ifttt.sh
+++ b/lgsm/functions/alert_ifttt.sh
@@ -6,7 +6,7 @@
 
 local modulename="ALERT"
 local commandaction="Alert"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 json=$(cat <<EOF
 {
diff --git a/lgsm/functions/alert_mailgun.sh b/lgsm/functions/alert_mailgun.sh
index 521a46fb9..a1564307e 100644
--- a/lgsm/functions/alert_mailgun.sh
+++ b/lgsm/functions/alert_mailgun.sh
@@ -6,7 +6,7 @@
 
 local modulename="ALERT"
 local commandaction="Alert"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_print_dots "Sending Email alert: Mailgun: ${email}"
 
diff --git a/lgsm/functions/alert_pushbullet.sh b/lgsm/functions/alert_pushbullet.sh
index 2a0947564..02f0e7b10 100644
--- a/lgsm/functions/alert_pushbullet.sh
+++ b/lgsm/functions/alert_pushbullet.sh
@@ -6,7 +6,7 @@
 
 local modulename="ALERT"
 local commandaction="Alert"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 json=$(cat <<EOF
 {
diff --git a/lgsm/functions/alert_pushover.sh b/lgsm/functions/alert_pushover.sh
index a57a5f4b5..35383bca9 100644
--- a/lgsm/functions/alert_pushover.sh
+++ b/lgsm/functions/alert_pushover.sh
@@ -6,7 +6,7 @@
 
 local modulename="ALERT"
 local commandaction="Alert"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_print_dots "Sending Pushover alert"
 
diff --git a/lgsm/functions/alert_telegram.sh b/lgsm/functions/alert_telegram.sh
index ca48f32be..90e2708f3 100644
--- a/lgsm/functions/alert_telegram.sh
+++ b/lgsm/functions/alert_telegram.sh
@@ -6,7 +6,7 @@
 
 local modulename="ALERT"
 local commandaction="Alert"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 json=$(cat <<EOF
 {
diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh
index a11753127..5e84d76d1 100644
--- a/lgsm/functions/command_backup.sh
+++ b/lgsm/functions/command_backup.sh
@@ -7,7 +7,7 @@
 
 local modulename="BACKUP"
 local commandaction="Backup"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local 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 796f24454..16578600c 100644
--- a/lgsm/functions/command_console.sh
+++ b/lgsm/functions/command_console.sh
@@ -6,7 +6,7 @@
 
 local modulename="CONSOLE"
 local commandaction="Console"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 check.sh
 fn_print_header
diff --git a/lgsm/functions/command_debug.sh b/lgsm/functions/command_debug.sh
index 4140ddcdd..5a681c4a2 100644
--- a/lgsm/functions/command_debug.sh
+++ b/lgsm/functions/command_debug.sh
@@ -6,7 +6,7 @@
 
 local modulename="DEBUG"
 local commandaction="Debug"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Trap to remove lockfile on quit.
 fn_lockfile_trap(){
diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh
index 461dc78f5..0551e2442 100644
--- a/lgsm/functions/command_details.sh
+++ b/lgsm/functions/command_details.sh
@@ -7,7 +7,7 @@
 
 local modulename="DETAILS"
 local commandaction="Details"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Run checks and gathers details to display.
 check.sh
diff --git a/lgsm/functions/command_dev_debug.sh b/lgsm/functions/command_dev_debug.sh
index ba80921c6..f17b67fe2 100644
--- a/lgsm/functions/command_dev_debug.sh
+++ b/lgsm/functions/command_dev_debug.sh
@@ -5,8 +5,8 @@
 # Description: Dev only: Enables debugging log to be saved to dev-debug.log.
 
 local modulename="DEV-DEBUG"
-local commandaction="Dev-Debug"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local commandaction="Dev Debug"
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 if [ -f "${rootdir}/.dev-debug" ]; then
 	rm "${rootdir:?}/.dev-debug"
diff --git a/lgsm/functions/command_dev_detect_deps.sh b/lgsm/functions/command_dev_detect_deps.sh
index b308c3579..79770044d 100644
--- a/lgsm/functions/command_dev_detect_deps.sh
+++ b/lgsm/functions/command_dev_detect_deps.sh
@@ -5,8 +5,8 @@
 # Description: Detects dependencies the server binary requires.
 
 local modulename="DETECT-DEPS"
-local commandaction="Detect-Deps"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local commandaction="Detect Deps"
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 echo -e "================================="
 echo -e "Dependencies Checker"
diff --git a/lgsm/functions/command_dev_detect_glibc.sh b/lgsm/functions/command_dev_detect_glibc.sh
index 0ffc7e0a7..49d7cc55a 100644
--- a/lgsm/functions/command_dev_detect_glibc.sh
+++ b/lgsm/functions/command_dev_detect_glibc.sh
@@ -6,8 +6,8 @@
 # Can check a file or directory recursively.
 
 local modulename="DETECT-GLIBC"
-local commandaction="Detect-Glibc"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local commandaction="Detect Glibc"
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 echo -e "================================="
 echo -e "glibc Requirements Checker"
diff --git a/lgsm/functions/command_dev_detect_ldd.sh b/lgsm/functions/command_dev_detect_ldd.sh
index f612366bf..919900de1 100644
--- a/lgsm/functions/command_dev_detect_ldd.sh
+++ b/lgsm/functions/command_dev_detect_ldd.sh
@@ -6,8 +6,8 @@
 # Can check a file or directory recursively.
 
 local modulename="DETECT-LDD"
-local commandaction="Detect-LDD"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local commandaction="Detect LDD"
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 echo -e "================================="
 echo -e "Shared Object dependencies Checker"
diff --git a/lgsm/functions/command_dev_query_raw.sh b/lgsm/functions/command_dev_query_raw.sh
index 78ba80e77..829acdc31 100644
--- a/lgsm/functions/command_dev_query_raw.sh
+++ b/lgsm/functions/command_dev_query_raw.sh
@@ -6,7 +6,7 @@
 
 local modulename="QUERY-RAW"
 local commandaction="Query Raw"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 echo -e ""
 echo -e "Query Port - Raw Output"
diff --git a/lgsm/functions/command_fastdl.sh b/lgsm/functions/command_fastdl.sh
index 12a33e8e1..4e0007fd8 100644
--- a/lgsm/functions/command_fastdl.sh
+++ b/lgsm/functions/command_fastdl.sh
@@ -7,7 +7,7 @@
 
 local modulename="FASTDL"
 local commandaction="FastDL"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local 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 caab4ee89..65b22de70 100644
--- a/lgsm/functions/command_install.sh
+++ b/lgsm/functions/command_install.sh
@@ -7,7 +7,7 @@
 
 local modulename="INSTALL"
 local commandaction="Install"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 check.sh
 if [ "$(whoami)" = "root" ]; then
diff --git a/lgsm/functions/command_install_resources_mta.sh b/lgsm/functions/command_install_resources_mta.sh
index 5874818a6..3d75824f7 100644
--- a/lgsm/functions/command_install_resources_mta.sh
+++ b/lgsm/functions/command_install_resources_mta.sh
@@ -6,7 +6,7 @@
 
 local modulename="DEFAULT_RESOURCES"
 local commandaction="Default Resources"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_install_resources(){
 	echo -e ""
diff --git a/lgsm/functions/command_mods_install.sh b/lgsm/functions/command_mods_install.sh
index 1bef36c25..971db3314 100644
--- a/lgsm/functions/command_mods_install.sh
+++ b/lgsm/functions/command_mods_install.sh
@@ -7,7 +7,7 @@
 
 local modulename="MODS"
 local commandaction="addons/mods"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 check.sh
 mods_core.sh
diff --git a/lgsm/functions/command_mods_remove.sh b/lgsm/functions/command_mods_remove.sh
index cec994fea..61289b60e 100644
--- a/lgsm/functions/command_mods_remove.sh
+++ b/lgsm/functions/command_mods_remove.sh
@@ -7,7 +7,7 @@
 
 local modulename="MODS"
 local commandaction="Mods Remove"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 check.sh
 mods_core.sh
diff --git a/lgsm/functions/command_mods_update.sh b/lgsm/functions/command_mods_update.sh
index 8d0146f09..44ff4d9b4 100644
--- a/lgsm/functions/command_mods_update.sh
+++ b/lgsm/functions/command_mods_update.sh
@@ -7,7 +7,7 @@
 
 local modulename="MODS"
 local commandaction="Mods Update"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 check.sh
 mods_core.sh
diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh
index 5c4ead99a..6d78e75da 100644
--- a/lgsm/functions/command_monitor.sh
+++ b/lgsm/functions/command_monitor.sh
@@ -8,7 +8,7 @@
 
 local modulename="MONITOR"
 local commandaction="Monitor"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_monitor_check_lockfile(){
 	# Monitor does not run it lockfile is not found.
diff --git a/lgsm/functions/command_postdetails.sh b/lgsm/functions/command_postdetails.sh
index e6cbcba60..b62cc708a 100644
--- a/lgsm/functions/command_postdetails.sh
+++ b/lgsm/functions/command_postdetails.sh
@@ -7,7 +7,7 @@
 
 local modulename="POSTDETAILS"
 local commandaction="Postdetails"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Set posttarget to the appropriately-defined post destination.
 
diff --git a/lgsm/functions/command_restart.sh b/lgsm/functions/command_restart.sh
index 56b6d7872..c127d21b4 100644
--- a/lgsm/functions/command_restart.sh
+++ b/lgsm/functions/command_restart.sh
@@ -6,7 +6,7 @@
 
 local modulename="RESTART"
 local commandaction="Restarting"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 info_config.sh
 exitbypass=1
diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh
index be230c26b..d1ee21e42 100644
--- a/lgsm/functions/command_start.sh
+++ b/lgsm/functions/command_start.sh
@@ -7,7 +7,7 @@
 
 local modulename="START"
 local commandaction="Starting"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_start_teamspeak3(){
 	if [ ! -f "${servercfgfullpath}" ]; then
diff --git a/lgsm/functions/command_stop.sh b/lgsm/functions/command_stop.sh
index fecd0fac5..956f41537 100644
--- a/lgsm/functions/command_stop.sh
+++ b/lgsm/functions/command_stop.sh
@@ -7,7 +7,7 @@
 
 local modulename="STOP"
 local commandaction="Stopping"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Attempts graceful shutdown by sending 'CTRL+c'.
 fn_stop_graceful_ctrlc(){
diff --git a/lgsm/functions/command_test_alert.sh b/lgsm/functions/command_test_alert.sh
index 77ff0d079..b921babe1 100644
--- a/lgsm/functions/command_test_alert.sh
+++ b/lgsm/functions/command_test_alert.sh
@@ -6,7 +6,7 @@
 
 local modulename="ALERT"
 local commandaction="Alert"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_print_dots "${servername}"
 check.sh
diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh
index dfe9c5824..91d19afeb 100644
--- a/lgsm/functions/command_ts3_server_pass.sh
+++ b/lgsm/functions/command_ts3_server_pass.sh
@@ -7,7 +7,7 @@
 
 local modulename="PASSWORD-CHANGE"
 local commandaction="Password Change"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_serveradmin_password_prompt(){
 	fn_print_header
diff --git a/lgsm/functions/command_update.sh b/lgsm/functions/command_update.sh
index 86a9a1cc4..f54423be4 100644
--- a/lgsm/functions/command_update.sh
+++ b/lgsm/functions/command_update.sh
@@ -6,7 +6,7 @@
 
 local modulename="UPDATE"
 local commandaction="Update"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_print_dots ""
 check.sh
diff --git a/lgsm/functions/command_update_linuxgsm.sh b/lgsm/functions/command_update_linuxgsm.sh
index ce8864c80..d141c0659 100644
--- a/lgsm/functions/command_update_linuxgsm.sh
+++ b/lgsm/functions/command_update_linuxgsm.sh
@@ -6,7 +6,7 @@
 
 local modulename="UPDATE LINUXGSM"
 local commandaction="Update LinuxGSM"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_print_dots "Updating LinuxGSM"
 check.sh
diff --git a/lgsm/functions/command_validate.sh b/lgsm/functions/command_validate.sh
index c48b7e16a..d1ec24971 100644
--- a/lgsm/functions/command_validate.sh
+++ b/lgsm/functions/command_validate.sh
@@ -6,7 +6,7 @@
 
 local modulename="VALIDATE"
 local commandaction="Validate"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_validate(){
 	fn_script_log_warn "Validating server: SteamCMD: Validate might overwrite some customised files"
diff --git a/lgsm/functions/command_wipe.sh b/lgsm/functions/command_wipe.sh
index dde48e23a..55e636b07 100644
--- a/lgsm/functions/command_wipe.sh
+++ b/lgsm/functions/command_wipe.sh
@@ -7,7 +7,7 @@
 
 local modulename="WIPE"
 local commandaction="Wipe"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 check.sh
 fn_print_header
diff --git a/lgsm/functions/compress_unreal2_maps.sh b/lgsm/functions/compress_unreal2_maps.sh
index bc7a9ffb8..99078bfc7 100644
--- a/lgsm/functions/compress_unreal2_maps.sh
+++ b/lgsm/functions/compress_unreal2_maps.sh
@@ -5,7 +5,7 @@
 # Description: Compresses unreal maps.
 
 local commandaction="Unreal Map Compressor"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 check.sh
 fn_print_header
diff --git a/lgsm/functions/compress_ut99_maps.sh b/lgsm/functions/compress_ut99_maps.sh
index 9f24ff9a3..94b3119ab 100644
--- a/lgsm/functions/compress_ut99_maps.sh
+++ b/lgsm/functions/compress_ut99_maps.sh
@@ -5,7 +5,7 @@
 # Description: Compresses unreal maps.
 
 local commandaction="Unreal Map Compressor"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 check.sh
 fn_print_header
diff --git a/lgsm/functions/core_dl.sh b/lgsm/functions/core_dl.sh
index c3281505d..244ccb9f9 100644
--- a/lgsm/functions/core_dl.sh
+++ b/lgsm/functions/core_dl.sh
@@ -19,7 +19,7 @@
 
 local modulename="DOWNLOAD"
 local commandaction="Download"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Emptys contents of the LinuxGSM tmpdir.
 fn_clear_tmp(){
diff --git a/lgsm/functions/core_exit.sh b/lgsm/functions/core_exit.sh
index ee7e9c6c8..5d242816c 100644
--- a/lgsm/functions/core_exit.sh
+++ b/lgsm/functions/core_exit.sh
@@ -23,6 +23,8 @@ fi
 if [ "${exitbypass}" ]; then
 	unset exitbypass
 elif [ "${exitcode}" ]&&[ "${exitcode}" != "0" ]; then
+	# List LinuxGSM version in logs
+	fn_script_log_info "LinuxGSM version: ${version}"
 	if [ "${exitcode}" == "1" ]; then
 		fn_script_log_fatal "${function_selfname} exiting with code: ${exitcode}"
 	elif [ "${exitcode}" == "2" ]; then
@@ -36,10 +38,21 @@ elif [ "${exitcode}" ]&&[ "${exitcode}" != "0" ]; then
 	# remove trap.
 	trap - INT
 	exit "${exitcode}"
-else
+elif [ "${exitcode}" ]&&[ "${exitcode}" == "0" ]; then
+	# List LinuxGSM version in logs
+	fn_script_log_info "LinuxGSM version: ${version}"
 	fn_script_log_pass "${function_selfname} exiting with code: ${exitcode}"
 	fn_exit_dev_debug
 	# remove trap.
 	trap - INT
 	exit "${exitcode}"
+else
+	# List LinuxGSM version in logs
+	fn_script_log_info "LinuxGSM version: ${version}"
+	fn_print_error "No exit code set"
+	fn_script_log_pass "${function_selfname} exiting with code: NOT SET"
+	fn_exit_dev_debug
+	# remove trap.
+	trap - INT
+	exit "${exitcode}"
 fi
diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh
index 477cd59fc..2eccb56cb 100644
--- a/lgsm/functions/core_getopt.sh
+++ b/lgsm/functions/core_getopt.sh
@@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: getopt arguments.
 
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 ### Define all commands here.
 ## User commands | Trigger commands | Description
@@ -167,14 +167,15 @@ fn_opt_usage(){
 		fi
 	done
 	} | column -s $'\t' -t
+	fn_script_log_pass "Display commands"
 	core_exit.sh
 }
 
-# Check if user commands exist and run corresponding scripts, or display script usage.
+# Check if command existw and run corresponding scripts, or display script usage.
 if [ -z "${getopt}" ]; then
 	fn_opt_usage
 fi
-# Command exists.
+# If command exists.
 for i in "${optcommands[@]}"; do
 	if [ "${i}" == "${getopt}" ] ; then
 		# Seek and run command.
@@ -185,8 +186,10 @@ for i in "${optcommands[@]}"; do
 				if [ "$(echo -e "${currentopt[index]}" | awk -F ';' -v x=${currcmdindex} '{ print $x }')" == "${getopt}" ]; then
 					# Run command.
 					eval "${currentopt[index+1]}"
+					# Exit should occur in modules. Should this not happen print an error
+					fn_print_error2_nl "Command did not exit correctly: ${getopt}"
+					fn_script_log_error "Command did not exit correctly: ${getopt}"
 					core_exit.sh
-					break
 				fi
 			done
 		done
@@ -194,7 +197,7 @@ for i in "${optcommands[@]}"; do
 done
 
 # If we're executing this, it means command was not found.
-echo -e "${red}Unknown command${default}: $0 ${getopt}"
-exitcode=2
+fn_print_error2_nl "Unknown command: $0 ${getopt}"
+fn_script_log_error "Unknown command: $0 ${getopt}"
 fn_opt_usage
 core_exit.sh
diff --git a/lgsm/functions/core_messages.sh b/lgsm/functions/core_messages.sh
index da90ebc43..59814f62f 100644
--- a/lgsm/functions/core_messages.sh
+++ b/lgsm/functions/core_messages.sh
@@ -47,7 +47,7 @@ fn_sleep_time(){
 fn_script_log(){
 	if [ -d "${lgsmlogdir}" ]; then
 		if [ "${modulename}" ]; then
-			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${commandname}: ${1}" >> "${lgsmlog}"
+			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${modulename}: ${1}" >> "${lgsmlog}"
 		else
 			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${1}" >> "${lgsmlog}"
 		fi
@@ -59,7 +59,7 @@ fn_script_log_pass(){
 	if [ -d "${lgsmlogdir}" ]; then
 
 		if [ "${modulename}" ]; then
-			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${commandname}: PASS: ${1}" >> "${lgsmlog}"
+			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${modulename}: PASS: ${1}" >> "${lgsmlog}"
 		else
 			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: PASS: ${1}" >> "${lgsmlog}"
 		fi
@@ -71,7 +71,7 @@ fn_script_log_pass(){
 fn_script_log_fatal(){
 	if [ -d "${lgsmlogdir}" ]; then
 		if [ "${modulename}" ]; then
-			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${commandname}: FATAL: ${1}" >> "${lgsmlog}"
+			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${modulename}: FATAL: ${1}" >> "${lgsmlog}"
 		else
 			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: FATAL: ${1}" >> "${lgsmlog}"
 		fi
@@ -83,7 +83,7 @@ fn_script_log_fatal(){
 fn_script_log_error(){
 	if [ -d "${lgsmlogdir}" ]; then
 		if [ "${modulename}" ]; then
-			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${commandname}: ERROR: ${1}" >> "${lgsmlog}"
+			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${modulename}: ERROR: ${1}" >> "${lgsmlog}"
 		else
 			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ERROR: ${1}" >> "${lgsmlog}"
 		fi
@@ -95,7 +95,7 @@ fn_script_log_error(){
 fn_script_log_warn(){
 	if [ -d "${lgsmlogdir}" ]; then
 		if [ "${modulename}" ]; then
-			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${commandname}: WARN: ${1}" >> "${lgsmlog}"
+			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${modulename}: WARN: ${1}" >> "${lgsmlog}"
 		else
 			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: WARN: ${1}" >> "${lgsmlog}"
 		fi
@@ -107,7 +107,7 @@ fn_script_log_warn(){
 fn_script_log_info(){
 	if [ -d "${lgsmlogdir}" ]; then
 		if [ "${modulename}" ]; then
-			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${commandname}: INFO: ${1}" >> "${lgsmlog}"
+			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${modulename}: INFO: ${1}" >> "${lgsmlog}"
 		else
 			echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: INFO: ${1}" >> "${lgsmlog}"
 		fi
diff --git a/lgsm/functions/fix_arma3.sh b/lgsm/functions/fix_arma3.sh
index de9785e51..4e496250c 100644
--- a/lgsm/functions/fix_arma3.sh
+++ b/lgsm/functions/fix_arma3.sh
@@ -6,7 +6,7 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Fixes: 20150 Segmentation fault (core dumped) error.
 if [ ! -d "${HOME}/.local/share/Arma 3" ]||[ ! -d "${HOME}/.local/share/Arma 3 - Other Profiles" ]; then
diff --git a/lgsm/functions/fix_csgo.sh b/lgsm/functions/fix_csgo.sh
index 0ea098eed..f1f9c9241 100644
--- a/lgsm/functions/fix_csgo.sh
+++ b/lgsm/functions/fix_csgo.sh
@@ -6,7 +6,7 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Fixes: server not always creating steam_appid.txt file.
 if [ ! -f "${serverfiles}/steam_appid.txt" ]; then
diff --git a/lgsm/functions/fix_dst.sh b/lgsm/functions/fix_dst.sh
index 46c17756b..ca86bdd4f 100644
--- a/lgsm/functions/fix_dst.sh
+++ b/lgsm/functions/fix_dst.sh
@@ -6,7 +6,7 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Fixes: ./dontstarve_dedicated_server_nullrenderer: ./lib32/libcurl-gnutls.so.4: no version information available (required by ./dontstarve_dedicated_server_nullrenderer).
 # Issue only occures on CentOS as libcurl-gnutls.so.4 is called libcurl.so.4 on CentOS.
diff --git a/lgsm/functions/fix_kf.sh b/lgsm/functions/fix_kf.sh
index 0ce05184b..f1b6d7b89 100644
--- a/lgsm/functions/fix_kf.sh
+++ b/lgsm/functions/fix_kf.sh
@@ -6,7 +6,7 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 echo -e "Applying WebAdmin ROOst.css fix."
 echo -e "http://forums.tripwireinteractive.com/showpost.php?p=585435&postcount=13"
diff --git a/lgsm/functions/fix_kf2.sh b/lgsm/functions/fix_kf2.sh
index 7cc1be568..2e54f1133 100644
--- a/lgsm/functions/fix_kf2.sh
+++ b/lgsm/functions/fix_kf2.sh
@@ -6,7 +6,7 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_parms(){
 parms="\"${defaultmap}?Game=KFGameContent.KFGameInfo_VersusSurvival\""
diff --git a/lgsm/functions/fix_mta.sh b/lgsm/functions/fix_mta.sh
index 236a2336b..6cb6a6c72 100644
--- a/lgsm/functions/fix_mta.sh
+++ b/lgsm/functions/fix_mta.sh
@@ -4,9 +4,10 @@
 # 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]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 if [ ! -f "${lgsmdir}/lib/libmysqlclient.so.16" ]; then
 	fixname="libmysqlclient16"
diff --git a/lgsm/functions/fix_nmrih.sh b/lgsm/functions/fix_nmrih.sh
index 8dd5f592c..7b27441d4 100644
--- a/lgsm/functions/fix_nmrih.sh
+++ b/lgsm/functions/fix_nmrih.sh
@@ -4,10 +4,13 @@
 # Description: Create symlinks for renamed No More Room In Hell serverfiles
 # Solution from Steam Community post: https://steamcommunity.com/app/224260/discussions/2/1732089092441769414/
 
+local modulename="FIX"
+local commandaction="Fix"
+
 ln -s "${serverfiles}/bin/vphysics_srv.so" "${serverfiles}/bin/vphysics.so"
 ln -s "${serverfiles}/bin/studiorender_srv.so" "${serverfiles}/bin/studiorender.so"
 ln -s "${serverfiles}/bin/soundemittersystem_srv.so" "${serverfiles}/bin/soundemittersystem.so"
 ln -s "${serverfiles}/bin/shaderapiempty_srv.so" "${serverfiles}/bin/shaderapiempty.so"
 ln -s "${serverfiles}/bin/scenefilecache_srv.so" "${serverfiles}/bin/scenefilecache.so"
 ln -s "${serverfiles}/bin/replay_srv.so" "${serverfiles}/bin/replay.so"
-ln -s "${serverfiles}/bin/materialsystem_srv.so" "${serverfiles}/bin/materialsystem.so" 
\ No newline at end of file
+ln -s "${serverfiles}/bin/materialsystem_srv.so" "${serverfiles}/bin/materialsystem.so"
diff --git a/lgsm/functions/fix_onset.sh b/lgsm/functions/fix_onset.sh
index 299e448fa..dd7ce5b4e 100644
--- a/lgsm/functions/fix_onset.sh
+++ b/lgsm/functions/fix_onset.sh
@@ -6,7 +6,7 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${serverfiles}"
 
diff --git a/lgsm/functions/fix_ro.sh b/lgsm/functions/fix_ro.sh
index e7ced52ad..f07581ae2 100644
--- a/lgsm/functions/fix_ro.sh
+++ b/lgsm/functions/fix_ro.sh
@@ -6,7 +6,7 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 echo -e "Applying WebAdmin ROOst.css fix."
 echo -e "http://forums.tripwireinteractive.com/showpost.php?p=585435&postcount=13"
diff --git a/lgsm/functions/fix_sfc.sh b/lgsm/functions/fix_sfc.sh
index ce42211fb..f74984753 100644
--- a/lgsm/functions/fix_sfc.sh
+++ b/lgsm/functions/fix_sfc.sh
@@ -6,7 +6,7 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 if [ ! -f "${serverfiles}/bin/datacache.so" ]; then
 	ln -s "${serverfiles}/bin/datacache_srv.so" "${serverfiles}/bin/datacache.so"
diff --git a/lgsm/functions/fix_ss3.sh b/lgsm/functions/fix_ss3.sh
index 1c81f87ae..c83c5bb9c 100644
--- a/lgsm/functions/fix_ss3.sh
+++ b/lgsm/functions/fix_ss3.sh
@@ -6,7 +6,7 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Fixes https://steamcommunity.com/app/41070/discussions/0/353916981477716386/
 if [ "$(diff "${HOME}/.steam/steamcmd/linux32/steamclient.so" "${serverfiles}/Bin/steamclient.so" >/dev/null)" ]; then
diff --git a/lgsm/functions/fix_steamcmd.sh b/lgsm/functions/fix_steamcmd.sh
index 3f4907d15..4cb846944 100644
--- a/lgsm/functions/fix_steamcmd.sh
+++ b/lgsm/functions/fix_steamcmd.sh
@@ -6,7 +6,7 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
+local 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
diff --git a/lgsm/functions/fix_terraria.sh b/lgsm/functions/fix_terraria.sh
index 8d9af0947..bce7d44f8 100644
--- a/lgsm/functions/fix_terraria.sh
+++ b/lgsm/functions/fix_terraria.sh
@@ -6,6 +6,6 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 export TERM=xterm
diff --git a/lgsm/functions/fix_tf2.sh b/lgsm/functions/fix_tf2.sh
index b0e9ce1ce..72c5b53ab 100644
--- a/lgsm/functions/fix_tf2.sh
+++ b/lgsm/functions/fix_tf2.sh
@@ -6,7 +6,7 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Fixes: Team Fortress 2 Segmentation fault for Red-Hat Distros #2062.
 if [ -f "/etc/redhat-release" ]&&[ ! -f "${serverfiles}/bin/libcurl-gnutls.so.4" ]; then
diff --git a/lgsm/functions/fix_ts3.sh b/lgsm/functions/fix_ts3.sh
index 2a921d91d..5b4c010c7 100644
--- a/lgsm/functions/fix_ts3.sh
+++ b/lgsm/functions/fix_ts3.sh
@@ -6,7 +6,7 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Fixes: makes libmariadb2 available #1924.
 if [ ! -f "${serverfiles}/libmariadb.so.2" ]; then
diff --git a/lgsm/functions/fix_ut.sh b/lgsm/functions/fix_ut.sh
index 7c8c12458..e3e004be4 100644
--- a/lgsm/functions/fix_ut.sh
+++ b/lgsm/functions/fix_ut.sh
@@ -6,7 +6,7 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 #Set Binary Executable
 echo -e "chmod +x ${executabledir}/${executable}"
diff --git a/lgsm/functions/fix_ut2k4.sh b/lgsm/functions/fix_ut2k4.sh
index 70ed0465d..8dfb33432 100644
--- a/lgsm/functions/fix_ut2k4.sh
+++ b/lgsm/functions/fix_ut2k4.sh
@@ -6,7 +6,7 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 echo -e "applying WebAdmin ut2003.css fix."
 echo -e "http://forums.tripwireinteractive.com/showpost.php?p=585435&postcount=13"
diff --git a/lgsm/functions/fix_ut3.sh b/lgsm/functions/fix_ut3.sh
index 3b5537d67..3595cb898 100644
--- a/lgsm/functions/fix_ut3.sh
+++ b/lgsm/functions/fix_ut3.sh
@@ -6,7 +6,7 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_parms(){
 parms="server VCTF-Suspense?Game=UTGameContent.UTVehicleCTFGame_Content?bIsDedicated=true?bIsLanMatch=false?bUsesStats=false?bShouldAdvertise=false?PureServer=1?bAllowJoinInProgress=true?ConfigSubDir=${selfname} -port=${port} -queryport=${queryport} -multihome=${ip} -nohomedir -unattended -log=${gamelog}"
diff --git a/lgsm/functions/fix_wurm.sh b/lgsm/functions/fix_wurm.sh
index 756636cac..f127ef142 100644
--- a/lgsm/functions/fix_wurm.sh
+++ b/lgsm/functions/fix_wurm.sh
@@ -4,6 +4,9 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with ARK: Survival Evolved.
 
+local modulename="FIX"
+local commandaction="Fix"
+
 # Copies steamclient.so to correct location.
 if [ ! -f "${serverfiles}/nativelibs" ]; then
 	cp -f "${serverfiles}/linux64/steamclient.so" "${serverfiles}/nativelibs"
diff --git a/lgsm/functions/fix_zmr.sh b/lgsm/functions/fix_zmr.sh
index 25deec45f..dade0ee1d 100644
--- a/lgsm/functions/fix_zmr.sh
+++ b/lgsm/functions/fix_zmr.sh
@@ -6,7 +6,7 @@
 
 local modulename="FIX"
 local commandaction="Fix"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 if [ ! -f "${serverfiles}/bin/datacache.so" ]; then
 	ln -s "${serverfiles}/bin/datacache_srv.so" "${serverfiles}/bin/datacache.so"
diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh
index 485893399..b657e80ac 100644
--- a/lgsm/functions/info_config.sh
+++ b/lgsm/functions/info_config.sh
@@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Gets specific details from config files.
 
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 ## Examples of filtering to get info from config files.
 # sed 's/foo//g' - remove foo
diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh
index d6cfc95f9..d3761b3d0 100644
--- a/lgsm/functions/info_distro.sh
+++ b/lgsm/functions/info_distro.sh
@@ -5,7 +5,7 @@
 # Description: Variables providing useful info on the Operating System such as disk and performace info.
 # Used for command_details.sh, command_debug.sh and alert.sh.
 
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 ### Game Server pid
 if [ "${status}" == "1" ]; then
diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh
index 620abf3ec..10b06c03a 100644
--- a/lgsm/functions/info_parms.sh
+++ b/lgsm/functions/info_parms.sh
@@ -4,7 +4,7 @@
 # Website: https://linuxgsm.com
 # Description: If specific parms are not set then this will be displayed in details.
 
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 ## Examples of filtering to get info from config files
 # sed 's/foo//g' - remove foo
diff --git a/lgsm/functions/install_complete.sh b/lgsm/functions/install_complete.sh
index 70f4e5345..03beeddd5 100644
--- a/lgsm/functions/install_complete.sh
+++ b/lgsm/functions/install_complete.sh
@@ -6,7 +6,7 @@
 
 local modulename="INSTALL"
 local commandaction="Install"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 echo -e ""
 echo -e "================================="
diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh
index f6d08a8d6..2f5cde136 100644
--- a/lgsm/functions/install_config.sh
+++ b/lgsm/functions/install_config.sh
@@ -6,7 +6,7 @@
 
 local modulename="INSTALL"
 local commandaction="Install"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Checks if server cfg dir exists, creates it if it doesn't.
 fn_check_cfgdir(){
diff --git a/lgsm/functions/install_dst_token.sh b/lgsm/functions/install_dst_token.sh
index 247280a56..b1fec01c3 100644
--- a/lgsm/functions/install_dst_token.sh
+++ b/lgsm/functions/install_dst_token.sh
@@ -6,7 +6,7 @@
 
 local modulename="INSTALL"
 local commandaction="Install"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 echo -e ""
 echo -e "${lightyellow}Enter ${gamename} Cluster Token${default}"
diff --git a/lgsm/functions/install_gslt.sh b/lgsm/functions/install_gslt.sh
index 3162f669c..ae10508b5 100644
--- a/lgsm/functions/install_gslt.sh
+++ b/lgsm/functions/install_gslt.sh
@@ -6,7 +6,7 @@
 
 local modulename="INSTALL"
 local commandaction="Install"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 echo -e ""
 echo -e "${lightyellow}Game Server Login Token${default}"
diff --git a/lgsm/functions/install_header.sh b/lgsm/functions/install_header.sh
index bd2e4524b..8a63fb289 100644
--- a/lgsm/functions/install_header.sh
+++ b/lgsm/functions/install_header.sh
@@ -6,7 +6,7 @@
 
 local modulename="INSTALL"
 local commandaction="Install"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 clear
 fn_print_ascii_logo
diff --git a/lgsm/functions/install_logs.sh b/lgsm/functions/install_logs.sh
index bb4fdd2b8..98057df6f 100644
--- a/lgsm/functions/install_logs.sh
+++ b/lgsm/functions/install_logs.sh
@@ -6,7 +6,7 @@
 
 local modulename="INSTALL"
 local commandaction="Install"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 if [ "${checklogs}" != "1" ]; then
 	echo -e ""
diff --git a/lgsm/functions/install_mta_resources.sh b/lgsm/functions/install_mta_resources.sh
index fb7bb012b..01ceeeb80 100644
--- a/lgsm/functions/install_mta_resources.sh
+++ b/lgsm/functions/install_mta_resources.sh
@@ -7,7 +7,7 @@
 
 local modulename="INSTALL"
 local commandaction="Install"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_print_information_nl "${gamename} will not function without resources!"
 echo -e "	* install default resources using ./${selfname} install-default-resources"
diff --git a/lgsm/functions/install_retry.sh b/lgsm/functions/install_retry.sh
index 15cbf938e..3a65049ce 100644
--- a/lgsm/functions/install_retry.sh
+++ b/lgsm/functions/install_retry.sh
@@ -6,7 +6,7 @@
 
 local modulename="INSTALL"
 local commandaction="Install"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 if fn_prompt_yn "Retry install?" Y; then
 	command_install.sh; core_exit.sh
diff --git a/lgsm/functions/install_server_dir.sh b/lgsm/functions/install_server_dir.sh
index 006264a06..71f2aa4c4 100644
--- a/lgsm/functions/install_server_dir.sh
+++ b/lgsm/functions/install_server_dir.sh
@@ -6,7 +6,7 @@
 
 local modulename="INSTALL"
 local commandaction="Install"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 echo -e ""
 echo -e "${lightyellow}Server Directory${default}"
diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh
index a015d32e0..9cc0e91c9 100644
--- a/lgsm/functions/install_server_files.sh
+++ b/lgsm/functions/install_server_files.sh
@@ -6,7 +6,7 @@
 
 local modulename="INSTALL"
 local commandaction="Install"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_install_server_files(){
 	if [ "${shortname}" == "ahl" ]; then
diff --git a/lgsm/functions/install_squad_license.sh b/lgsm/functions/install_squad_license.sh
index cd8ba87b6..accb3021e 100644
--- a/lgsm/functions/install_squad_license.sh
+++ b/lgsm/functions/install_squad_license.sh
@@ -6,7 +6,7 @@
 
 local modulename="INSTALL"
 local commandaction="Install"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 echo -e ""
 echo -e "${lightyellow}Squad Server License${default}"
diff --git a/lgsm/functions/install_stats.sh b/lgsm/functions/install_stats.sh
index 4a00edd49..2d44706e8 100644
--- a/lgsm/functions/install_stats.sh
+++ b/lgsm/functions/install_stats.sh
@@ -6,7 +6,7 @@
 
 local modulename="INSTALL"
 local commandaction="Install"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 echo -e ""
 echo -e "${lightyellow}LinuxGSM Stats${default}"
diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh
index cf8831dd3..7cc448d7b 100644
--- a/lgsm/functions/install_ts3db.sh
+++ b/lgsm/functions/install_ts3db.sh
@@ -7,7 +7,7 @@
 
 local modulename="INSTALL"
 local commandaction="Install"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_install_ts3db_mariadb(){
 	if [ ! -f "${serverfiles}/libts3db_mariadb.so" ]; then
diff --git a/lgsm/functions/install_ut2k4_key.sh b/lgsm/functions/install_ut2k4_key.sh
index c5eff82e6..cb02829d2 100644
--- a/lgsm/functions/install_ut2k4_key.sh
+++ b/lgsm/functions/install_ut2k4_key.sh
@@ -6,7 +6,7 @@
 
 local modulename="INSTALL"
 local commandaction="Install"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 echo -e ""
 echo -e "${lightyellow}Enter ${gamename} CD Key${default}"
diff --git a/lgsm/functions/mods_core.sh b/lgsm/functions/mods_core.sh
index 68f791dbd..ff088653b 100644
--- a/lgsm/functions/mods_core.sh
+++ b/lgsm/functions/mods_core.sh
@@ -7,7 +7,7 @@
 
 local modulename="MODS"
 local commandaction="Mods"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Files and Directories.
 modsdir="${lgsmdir}/mods"
diff --git a/lgsm/functions/mods_list.sh b/lgsm/functions/mods_list.sh
index 8037f1eed..ed354d153 100644
--- a/lgsm/functions/mods_list.sh
+++ b/lgsm/functions/mods_list.sh
@@ -10,7 +10,7 @@
 
 local modulename="MODS"
 local commandaction="List Mods"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Get a proper URL for mods that don't provide a good one (optional)
 fn_script_log_info "Retrieving latest mods URLs"
diff --git a/lgsm/functions/update_factorio.sh b/lgsm/functions/update_factorio.sh
index b6700f66c..1fcfe9bf9 100644
--- a/lgsm/functions/update_factorio.sh
+++ b/lgsm/functions/update_factorio.sh
@@ -6,7 +6,7 @@
 
 local modulename="UPDATE"
 local commandaction="Update"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_update_factorio_dl(){
 	fn_fetch_file "https://factorio.com/get-download/${downloadbranch}/headless/${factorioarch}" "${tmpdir}" "factorio_headless_${factorioarch}-${remotebuild}.tar.xz"
diff --git a/lgsm/functions/update_minecraft.sh b/lgsm/functions/update_minecraft.sh
index 361867467..a8f97dd17 100644
--- a/lgsm/functions/update_minecraft.sh
+++ b/lgsm/functions/update_minecraft.sh
@@ -6,7 +6,7 @@
 
 local modulename="UPDATE"
 local commandaction="Update"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_update_minecraft_dl(){
 	if [ "${branch}" == "release" ]; then
diff --git a/lgsm/functions/update_minecraft_bedrock.sh b/lgsm/functions/update_minecraft_bedrock.sh
index 2cb29930f..d9d875c45 100644
--- a/lgsm/functions/update_minecraft_bedrock.sh
+++ b/lgsm/functions/update_minecraft_bedrock.sh
@@ -6,7 +6,7 @@
 
 local modulename="UPDATE"
 local commandaction="Update"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_update_minecraft_dl(){
 	latestmcbuildurl=$(curl -s "https://www.minecraft.net/en-us/download/server/bedrock/" | grep -o 'https://minecraft.azureedge.net/bin-linux/[^"]*zip')
diff --git a/lgsm/functions/update_mta.sh b/lgsm/functions/update_mta.sh
index 5c5824983..db3080b17 100644
--- a/lgsm/functions/update_mta.sh
+++ b/lgsm/functions/update_mta.sh
@@ -6,7 +6,7 @@
 
 local modulename="UPDATE"
 local commandaction="Update"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_update_mta_dl(){
 	fn_fetch_file "http://linux.mtasa.com/dl/multitheftauto_linux_x64.tar.gz" "${tmpdir}" "multitheftauto_linux_x64.tar.gz"
diff --git a/lgsm/functions/update_mumble.sh b/lgsm/functions/update_mumble.sh
index af320079d..88a7102c8 100644
--- a/lgsm/functions/update_mumble.sh
+++ b/lgsm/functions/update_mumble.sh
@@ -6,7 +6,7 @@
 
 local modulename="UPDATE"
 local commandaction="Update"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_update_mumble_dl(){
 	fn_fetch_file "https://github.com/mumble-voip/mumble/releases/download/${remotebuild}/murmur-static_${mumblearch}-${remotebuild}.tar.bz2" "${tmpdir}" "murmur-static_${mumblearch}-${remotebuild}.tar.bz2"
diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh
index f2651b3de..ef2a3f9ad 100644
--- a/lgsm/functions/update_steamcmd.sh
+++ b/lgsm/functions/update_steamcmd.sh
@@ -6,7 +6,7 @@
 
 local modulename="UPDATE"
 local commandaction="Update"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_update_steamcmd_dl(){
 	info_config.sh
diff --git a/lgsm/functions/update_ts3.sh b/lgsm/functions/update_ts3.sh
index 0ca4b0842..593183f6f 100644
--- a/lgsm/functions/update_ts3.sh
+++ b/lgsm/functions/update_ts3.sh
@@ -6,7 +6,7 @@
 
 local modulename="UPDATE"
 local commandaction="Update"
-local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_update_ts3_dl(){
 	if [ "${ts3arch}" == "amd64" ]; then