From 879a1ce144bc998087d907122cc582dbdcb2c480 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 27 Dec 2015 20:23:05 +0000 Subject: [PATCH] Re-ordered functions grouped functions together. --- functions/core_functions.sh | 137 ++++++++++++++++++++++++------------ 1 file changed, 92 insertions(+), 45 deletions(-) diff --git a/functions/core_functions.sh b/functions/core_functions.sh index 363727a84..2ba12010e 100644 --- a/functions/core_functions.sh +++ b/functions/core_functions.sh @@ -7,127 +7,170 @@ lgsm_version="271215" # Description: Defines all functions to allow download and execution of functions using fn_runfunction. # This function is called first before any other function. Without this file other functions would not load. -fix_arma3.sh(){ +#Legacy functions + +fn_functions(){ functionfile="${FUNCNAME}" fn_runfunction } -command_backup.sh(){ +fn_getopt(){ functionfile="${FUNCNAME}" fn_runfunction } -check.sh(){ + +# Core + +core_getopt.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -check_ip.sh(){ +core_messages.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -check_logs.sh(){ + +# Command + +command_console.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -check_root.sh(){ +command_debug.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -check_steamcmd.sh(){ +command_details.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -check_steamuser.sh(){ +command_backup.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -check_systemdir.sh(){ +command_monitor.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -check_tmux.sh(){ +command_start.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -check_ts3status.sh(){ +command_stop.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -command_console.sh(){ +command_validate.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -compress_unreal2_maps.sh(){ +command_install.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -compress_ut99_maps.sh(){ +fn_restart(){ +local modulename="Restarting" +info_config.sh +fn_scriptlog "${servername}" +command_stop.sh +command_start.sh +} + + +# Checks + +check.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -fix_csgo.sh(){ +check_ip.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -command_debug.sh(){ +check_logs.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -command_details.sh(){ +check_root.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -info_config.sh(){ +check_steamcmd.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -info_distro.sh(){ +check_steamuser.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -info_glibc.sh(){ +check_systemdir.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -dev_debug.sh(){ +check_tmux.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -dev_detect_deps.sh(){ +check_ts3status.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -email.sh(){ + +# Compress + +compress_unreal2_maps.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -email_test.sh(){ +compress_ut99_maps.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -core_getopt.sh(){ + +# Dev + +dev_debug.sh(){ +functionfile="${FUNCNAME}" +fn_runfunction +} + +dev_detect_deps.sh(){ +functionfile="${FUNCNAME}" +fn_runfunction +} + + +# Fix + +fix_arma3.sh(){ +functionfile="${FUNCNAME}" +fn_runfunction +} + +fix_csgo.sh(){ functionfile="${FUNCNAME}" fn_runfunction } @@ -137,44 +180,56 @@ functionfile="${FUNCNAME}" fn_runfunction } -logs.sh(){ + +# Info + +info_config.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -core_messages.sh(){ +info_distro.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -command_monitor.sh(){ +info_glibc.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -monitor_gsquery.sh(){ + +# Email + +email.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -fn_restart(){ -local modulename="Restarting" -info_config.sh -fn_scriptlog "${servername}" -command_stop.sh -command_start.sh +email_test.sh(){ +functionfile="${FUNCNAME}" +fn_runfunction } -command_start.sh(){ + +# Logs + +logs.sh(){ functionfile="${FUNCNAME}" fn_runfunction } -command_stop.sh(){ + +# Monitor + +monitor_gsquery.sh(){ functionfile="${FUNCNAME}" fn_runfunction } + +# Update + update_check.sh(){ functionfile="${FUNCNAME}" fn_runfunction @@ -195,10 +250,6 @@ functionfile="${FUNCNAME}" fn_runfunction } -command_validate.sh(){ -functionfile="${FUNCNAME}" -fn_runfunction -} # ## Installer functions @@ -209,10 +260,6 @@ autoinstall=1 command_install.sh } -command_install.sh(){ -functionfile="${FUNCNAME}" -fn_runfunction -} install_complete.sh(){ functionfile="${FUNCNAME}"