From 5691e52e94d71a4508fc5e172bc4cd18748ba687 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Mon, 9 Feb 2026 00:05:00 +0000
Subject: [PATCH] Refactors and reorders core modules

Improves module loading by reordering and refactoring the core modules.

This change addresses inconsistencies and improves the overall structure
of how core modules are handled within the system.
Some fix scripts were renamed to match the module name.
---
 lgsm/modules/core_modules.sh | 204 +++++++++++++++++------------------
 lgsm/modules/fix_sof2.sh     |   2 +-
 lgsm/modules/fix_st.sh       |   2 +-
 lgsm/modules/fix_unt.sh      |   2 +-
 lgsm/modules/fix_vh.sh       |   2 +-
 5 files changed, 101 insertions(+), 111 deletions(-)

diff --git a/lgsm/modules/core_modules.sh b/lgsm/modules/core_modules.sh
index 614f5d019..2ab555d05 100644
--- a/lgsm/modules/core_modules.sh
+++ b/lgsm/modules/core_modules.sh
@@ -21,24 +21,6 @@ core_dl.sh() {
 	fi
 }
 
-core_messages.sh() {
-	modulefile="${FUNCNAME[0]}"
-	if [ "$(type fn_fetch_core_dl 2>/dev/null)" ]; then
-		fn_fetch_core_dl "lgsm/modules" "core_messages.sh" "${modulesdir}" "chmodx" "run" "noforcedl" "nohash"
-	else
-		fn_bootstrap_fetch_file_github "lgsm/modules" "core_messages.sh" "${modulesdir}" "chmodx" "run" "noforcedl" "nohash"
-	fi
-}
-
-core_legacy.sh() {
-	modulefile="${FUNCNAME[0]}"
-	if [ "$(type fn_fetch_core_dl 2>/dev/null)" ]; then
-		fn_fetch_core_dl "lgsm/modules" "core_legacy.sh" "${modulesdir}" "chmodx" "run" "noforcedl" "nohash"
-	else
-		fn_bootstrap_fetch_file_github "lgsm/modules" "core_legacy.sh" "${modulesdir}" "chmodx" "run" "noforcedl" "nohash"
-	fi
-}
-
 core_exit.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
@@ -54,17 +36,35 @@ core_getopt.sh() {
 	fn_fetch_module
 }
 
-core_trap.sh() {
+core_github.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
+core_legacy.sh() {
+	modulefile="${FUNCNAME[0]}"
+	if [ "$(type fn_fetch_core_dl 2>/dev/null)" ]; then
+		fn_fetch_core_dl "lgsm/modules" "core_legacy.sh" "${modulesdir}" "chmodx" "run" "noforcedl" "nohash"
+	else
+		fn_bootstrap_fetch_file_github "lgsm/modules" "core_legacy.sh" "${modulesdir}" "chmodx" "run" "noforcedl" "nohash"
+	fi
+}
+
+core_messages.sh() {
+	modulefile="${FUNCNAME[0]}"
+	if [ "$(type fn_fetch_core_dl 2>/dev/null)" ]; then
+		fn_fetch_core_dl "lgsm/modules" "core_messages.sh" "${modulesdir}" "chmodx" "run" "noforcedl" "nohash"
+	else
+		fn_bootstrap_fetch_file_github "lgsm/modules" "core_messages.sh" "${modulesdir}" "chmodx" "run" "noforcedl" "nohash"
+	fi
+}
+
 core_steamcmd.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-core_github.sh() {
+core_trap.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
@@ -91,87 +91,87 @@ command_details.sh() {
 	fn_fetch_module
 }
 
-command_sponsor.sh() {
+command_fastdl.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_postdetails.sh() {
+command_install.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_test_alert.sh() {
+command_install_resources_mta.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_monitor.sh() {
+command_mods_install.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_start.sh() {
+command_mods_remove.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_stop.sh() {
+command_mods_update.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_validate.sh() {
+command_monitor.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_install.sh() {
+command_postdetails.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_install_resources_mta.sh() {
+command_restart.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-install_squad_license.sh() {
+command_send.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_mods_install.sh() {
+command_skeleton.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_mods_update.sh() {
+command_sponsor.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_mods_remove.sh() {
+command_start.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_fastdl.sh() {
+command_stop.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_ts3_server_pass.sh() {
+command_test_alert.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_restart.sh() {
+command_ts3_server_pass.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_skeleton.sh() {
+command_validate.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
@@ -181,7 +181,7 @@ command_wipe.sh() {
 	fn_fetch_module
 }
 
-command_send.sh() {
+install_squad_license.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
@@ -277,12 +277,12 @@ compress_unreal2_maps.sh() {
 
 # Mods
 
-mods_list.sh() {
+mods_core.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-mods_core.sh() {
+mods_list.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
@@ -299,37 +299,37 @@ command_dev_debug.sh() {
 	fn_fetch_module
 }
 
-command_dev_parse_game_details.sh() {
+command_dev_detect_deps.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_dev_parse_distro_details.sh() {
+command_dev_detect_glibc.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_dev_detect_deps.sh() {
+command_dev_detect_ldd.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_dev_detect_glibc.sh() {
+command_dev_parse_distro_details.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_dev_detect_ldd.sh() {
+command_dev_parse_game_details.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_dev_ui.sh() {
+command_dev_query_raw.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_dev_query_raw.sh() {
+command_dev_ui.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
@@ -346,27 +346,27 @@ fix_ark.sh() {
 	fn_fetch_module
 }
 
-fix_av.sh() {
+fix_arma3.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-fix_arma3.sh() {
+fix_armar.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-fix_armar.sh() {
+fix_av.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-fix_bt.sh() {
+fix_bo.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-fix_bo.sh() {
+fix_bt.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
@@ -446,67 +446,62 @@ fix_rw.sh() {
 	fn_fetch_module
 }
 
-fix_sfc.sh() {
-	modulefile="${FUNCNAME[0]}"
-	fn_fetch_module
-}
-
-fix_sm.sh() {
+fix_samp.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-fix_st.sh() {
+fix_sfc.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-fix_steamcmd.sh() {
+fix_sm.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-fix_terraria.sh() {
+fix_sof2.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-fix_tf2.sh() {
+fix_squad.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-fix_ut3.sh() {
+fix_st.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-fix_rust.sh() {
+fix_steamcmd.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-fix_samp.sh() {
+fix_terraria.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-fix_sdtd.sh() {
+fix_tf2.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-fix_sof2.sh() {
+fix_ts3.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-fix_squad.sh() {
+fix_unt.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-fix_ts3.sh() {
+fix_ut.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
@@ -516,12 +511,7 @@ fix_ut2k4.sh() {
 	fn_fetch_module
 }
 
-fix_ut.sh() {
-	modulefile="${FUNCNAME[0]}"
-	fn_fetch_module
-}
-
-fix_unt.sh() {
+fix_ut3.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
@@ -585,27 +575,27 @@ alert_email.sh() {
 	fn_fetch_module
 }
 
-alert_ifttt.sh() {
+alert_gotify.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-alert_pushbullet.sh() {
+alert_ifttt.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-alert_pushover.sh() {
+alert_ntfy.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-alert_gotify.sh() {
+alert_pushbullet.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-alert_telegram.sh() {
+alert_pushover.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
@@ -620,10 +610,11 @@ alert_slack.sh() {
 	fn_fetch_module
 }
 
-alert_ntfy.sh() {
+alert_telegram.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
+
 # Logs
 
 core_logs.sh() {
@@ -639,58 +630,57 @@ query_gamedig.sh() {
 }
 
 # Update
-
-command_update_modules.sh() {
+command_check_update.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_update_linuxgsm.sh() {
+command_update.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_update.sh() {
+command_update_linuxgsm.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-command_check_update.sh() {
+command_update_modules.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-update_ts3.sh() {
+fn_update_modules.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-update_mc.sh() {
+update_fctr.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-update_mcb.sh() {
+update_jk2.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-update_pmc.sh() {
+update_mc.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-update_mta.sh() {
+update_mcb.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-update_fctr.sh() {
+update_mta.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-update_jk2.sh() {
+update_pmc.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
@@ -700,7 +690,7 @@ update_steamcmd.sh() {
 	fn_fetch_module
 }
 
-update_vints.sh() {
+update_ts3.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
@@ -710,12 +700,12 @@ update_ut99.sh() {
 	fn_fetch_module
 }
 
-update_xnt.sh() {
+update_vints.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-fn_update_modules.sh() {
+update_xnt.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
@@ -723,6 +713,10 @@ fn_update_modules.sh() {
 #
 ## Installer modules
 #
+check_gamedig.sh() {
+	modulefile="${FUNCNAME[0]}"
+	fn_fetch_module
+}
 
 fn_autoinstall() {
 	autoinstall=1
@@ -739,32 +733,32 @@ install_config.sh() {
 	fn_fetch_module
 }
 
-install_factorio_save.sh() {
+install_dl_ut2k4.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-check_gamedig.sh() {
+install_dst_token.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-install_dst_token.sh() {
+install_eula.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-install_eula.sh() {
+install_factorio_save.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-install_gsquery.sh() {
+install_gslt.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-install_gslt.sh() {
+install_gsquery.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
@@ -788,6 +782,7 @@ install_server_dir.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
+
 install_server_files.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
@@ -818,11 +813,6 @@ install_ut2k4.sh() {
 	fn_fetch_module
 }
 
-install_dl_ut2k4.sh() {
-	modulefile="${FUNCNAME[0]}"
-	fn_fetch_module
-}
-
 install_ut2k4_key.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
diff --git a/lgsm/modules/fix_sof2.sh b/lgsm/modules/fix_sof2.sh
index 45e3b299c..3eb95bc9f 100644
--- a/lgsm/modules/fix_sof2.sh
+++ b/lgsm/modules/fix_sof2.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# LinuxGSM fix_rust.sh module
+# LinuxGSM fix_sof2.sh module
 # Author: Daniel Gibbs
 # Contributors: https://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
diff --git a/lgsm/modules/fix_st.sh b/lgsm/modules/fix_st.sh
index bbd9890bd..598d971b0 100644
--- a/lgsm/modules/fix_st.sh
+++ b/lgsm/modules/fix_st.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# LinuxGSM fix_rust.sh module
+# LinuxGSM fix_ts.sh module
 # Author: Daniel Gibbs
 # Contributors: https://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
diff --git a/lgsm/modules/fix_unt.sh b/lgsm/modules/fix_unt.sh
index dbe64ffd6..f32737285 100644
--- a/lgsm/modules/fix_unt.sh
+++ b/lgsm/modules/fix_unt.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# LinuxGSM fix_rust.sh module
+# LinuxGSM fix_unt.sh module
 # Author: Daniel Gibbs
 # Contributors: https://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
diff --git a/lgsm/modules/fix_vh.sh b/lgsm/modules/fix_vh.sh
index e9cf7a6e1..c6564eb19 100644
--- a/lgsm/modules/fix_vh.sh
+++ b/lgsm/modules/fix_vh.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# LinuxGSM fix_rust.sh module
+# LinuxGSM fix_vh.sh module
 # Author: Alasdair Haig
 # Website: https://linuxgsm.com
 # Description: Resolves issues with Valheim.