gsd
/
LinuxGSM
mirror of https://github.com/GameServerManagers/LinuxGSM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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.
pull/4854/head
Daniel Gibbs 4 months ago
parent
52b579d26f
commit
5691e52e94
Failed to extract signature
5 changed files with 101 additions and 111 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 204
      lgsm/modules/core_modules.sh
  2. 2
      lgsm/modules/fix_sof2.sh
  3. 2
      lgsm/modules/fix_st.sh
  4. 2
      lgsm/modules/fix_unt.sh
  5. 2
      lgsm/modules/fix_vh.sh

204
lgsm/modules/core_modules.sh
View File

@ -21,24 +21,6 @@ core_dl.sh() {
fi 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() { core_exit.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
@ -54,17 +36,35 @@ core_getopt.sh() {
fn_fetch_module fn_fetch_module
} }
core_trap.sh() { core_github.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module 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() { core_steamcmd.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
core_github.sh() { core_trap.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
@ -91,87 +91,87 @@ command_details.sh() {
fn_fetch_module fn_fetch_module
} }
command_sponsor.sh() { command_fastdl.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_postdetails.sh() { command_install.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_test_alert.sh() { command_install_resources_mta.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_monitor.sh() { command_mods_install.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_start.sh() { command_mods_remove.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_stop.sh() { command_mods_update.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_validate.sh() { command_monitor.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_install.sh() { command_postdetails.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_install_resources_mta.sh() { command_restart.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
install_squad_license.sh() { command_send.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_mods_install.sh() { command_skeleton.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_mods_update.sh() { command_sponsor.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_mods_remove.sh() { command_start.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_fastdl.sh() { command_stop.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_ts3_server_pass.sh() { command_test_alert.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_restart.sh() { command_ts3_server_pass.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_skeleton.sh() { command_validate.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
@ -181,7 +181,7 @@ command_wipe.sh() {
fn_fetch_module fn_fetch_module
} }
command_send.sh() { install_squad_license.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
@ -277,12 +277,12 @@ compress_unreal2_maps.sh() {
# Mods # Mods
mods_list.sh() { mods_core.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
mods_core.sh() { mods_list.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
@ -299,37 +299,37 @@ command_dev_debug.sh() {
fn_fetch_module fn_fetch_module
} }
command_dev_parse_game_details.sh() { command_dev_detect_deps.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_dev_parse_distro_details.sh() { command_dev_detect_glibc.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_dev_detect_deps.sh() { command_dev_detect_ldd.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_dev_detect_glibc.sh() { command_dev_parse_distro_details.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_dev_detect_ldd.sh() { command_dev_parse_game_details.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_dev_ui.sh() { command_dev_query_raw.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_dev_query_raw.sh() { command_dev_ui.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
@ -346,27 +346,27 @@ fix_ark.sh() {
fn_fetch_module fn_fetch_module
} }
fix_av.sh() { fix_arma3.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
fix_arma3.sh() { fix_armar.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
fix_armar.sh() { fix_av.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
fix_bt.sh() { fix_bo.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
fix_bo.sh() { fix_bt.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
@ -446,67 +446,62 @@ fix_rw.sh() {
fn_fetch_module fn_fetch_module
} }
fix_sfc.sh() { fix_samp.sh() {
modulefile="${FUNCNAME[0]}"
fn_fetch_module
}
fix_sm.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
fix_st.sh() { fix_sfc.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
fix_steamcmd.sh() { fix_sm.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
fix_terraria.sh() { fix_sof2.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
fix_tf2.sh() { fix_squad.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
fix_ut3.sh() { fix_st.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
fix_rust.sh() { fix_steamcmd.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
fix_samp.sh() { fix_terraria.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
fix_sdtd.sh() { fix_tf2.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
fix_sof2.sh() { fix_ts3.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
fix_squad.sh() { fix_unt.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
fix_ts3.sh() { fix_ut.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
@ -516,12 +511,7 @@ fix_ut2k4.sh() {
fn_fetch_module fn_fetch_module
} }
fix_ut.sh() { fix_ut3.sh() {
modulefile="${FUNCNAME[0]}"
fn_fetch_module
}
fix_unt.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
@ -585,27 +575,27 @@ alert_email.sh() {
fn_fetch_module fn_fetch_module
} }
alert_ifttt.sh() { alert_gotify.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
alert_pushbullet.sh() { alert_ifttt.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
alert_pushover.sh() { alert_ntfy.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
alert_gotify.sh() { alert_pushbullet.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
alert_telegram.sh() { alert_pushover.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
@ -620,10 +610,11 @@ alert_slack.sh() {
fn_fetch_module fn_fetch_module
} }
alert_ntfy.sh() { alert_telegram.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
# Logs # Logs
core_logs.sh() { core_logs.sh() {
@ -639,58 +630,57 @@ query_gamedig.sh() {
} }
# Update # Update
command_check_update.sh() {
command_update_modules.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_update_linuxgsm.sh() { command_update.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_update.sh() { command_update_linuxgsm.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
command_check_update.sh() { command_update_modules.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
update_ts3.sh() { fn_update_modules.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
update_mc.sh() { update_fctr.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
update_mcb.sh() { update_jk2.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
update_pmc.sh() { update_mc.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
update_mta.sh() { update_mcb.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
update_fctr.sh() { update_mta.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
update_jk2.sh() { update_pmc.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
@ -700,7 +690,7 @@ update_steamcmd.sh() {
fn_fetch_module fn_fetch_module
} }
update_vints.sh() { update_ts3.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
@ -710,12 +700,12 @@ update_ut99.sh() {
fn_fetch_module fn_fetch_module
} }
update_xnt.sh() { update_vints.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
fn_update_modules.sh() { update_xnt.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
@ -723,6 +713,10 @@ fn_update_modules.sh() {
# #
## Installer modules ## Installer modules
# #
check_gamedig.sh() {
modulefile="${FUNCNAME[0]}"
fn_fetch_module
}
fn_autoinstall() { fn_autoinstall() {
autoinstall=1 autoinstall=1
@ -739,32 +733,32 @@ install_config.sh() {
fn_fetch_module fn_fetch_module
} }
install_factorio_save.sh() { install_dl_ut2k4.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
check_gamedig.sh() { install_dst_token.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
install_dst_token.sh() { install_eula.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
install_eula.sh() { install_factorio_save.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
install_gsquery.sh() { install_gslt.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
install_gslt.sh() { install_gsquery.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
@ -788,6 +782,7 @@ install_server_dir.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
} }
install_server_files.sh() { install_server_files.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module
@ -818,11 +813,6 @@ install_ut2k4.sh() {
fn_fetch_module fn_fetch_module
} }
install_dl_ut2k4.sh() {
modulefile="${FUNCNAME[0]}"
fn_fetch_module
}
install_ut2k4_key.sh() { install_ut2k4_key.sh() {
modulefile="${FUNCNAME[0]}" modulefile="${FUNCNAME[0]}"
fn_fetch_module fn_fetch_module

2
lgsm/modules/fix_sof2.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# LinuxGSM fix_rust.sh module # LinuxGSM fix_sof2.sh module
# Author: Daniel Gibbs # Author: Daniel Gibbs
# Contributors: https://linuxgsm.com/contrib # Contributors: https://linuxgsm.com/contrib
# Website: https://linuxgsm.com # Website: https://linuxgsm.com

2
lgsm/modules/fix_st.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# LinuxGSM fix_rust.sh module # LinuxGSM fix_ts.sh module
# Author: Daniel Gibbs # Author: Daniel Gibbs
# Contributors: https://linuxgsm.com/contrib # Contributors: https://linuxgsm.com/contrib
# Website: https://linuxgsm.com # Website: https://linuxgsm.com

2
lgsm/modules/fix_unt.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# LinuxGSM fix_rust.sh module # LinuxGSM fix_unt.sh module
# Author: Daniel Gibbs # Author: Daniel Gibbs
# Contributors: https://linuxgsm.com/contrib # Contributors: https://linuxgsm.com/contrib
# Website: https://linuxgsm.com # Website: https://linuxgsm.com

2
lgsm/modules/fix_vh.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# LinuxGSM fix_rust.sh module # LinuxGSM fix_vh.sh module
# Author: Alasdair Haig # Author: Alasdair Haig
# Website: https://linuxgsm.com # Website: https://linuxgsm.com
# Description: Resolves issues with Valheim. # Description: Resolves issues with Valheim.

Write Preview
Loading…
Cancel
Save