From 79a411f9bcc0adc533e56e794f4b8fac569c6b17 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 11 Jul 2020 00:22:15 +0100 Subject: [PATCH] fn_commandname --- lgsm/functions/alert.sh | 1 + lgsm/functions/check_last_update.sh | 1 + lgsm/functions/check_version.sh | 1 + lgsm/functions/command_install.sh | 1 + lgsm/functions/command_mods_remove.sh | 1 + lgsm/functions/command_monitor.sh | 1 + lgsm/functions/command_ts3_server_pass.sh | 4 ++++ lgsm/functions/info_messages.sh | 4 ++-- lgsm/functions/install_modules.sh | 1 + lgsm/functions/update_minecraft.sh | 3 +++ lgsm/functions/update_minecraft_bedrock.sh | 3 +++ lgsm/functions/update_mta.sh | 4 +++- lgsm/functions/update_mumble.sh | 1 - lgsm/functions/update_steamcmd.sh | 1 + lgsm/functions/update_ts3.sh | 2 -- 15 files changed, 23 insertions(+), 6 deletions(-) diff --git a/lgsm/functions/alert.sh b/lgsm/functions/alert.sh index 5f8fe156e..236ca6461 100644 --- a/lgsm/functions/alert.sh +++ b/lgsm/functions/alert.sh @@ -99,6 +99,7 @@ fn_alert_log if [ "${postalert}" == "on" ]&&[ -n "${postalert}" ]; then exitbypass=1 command_postdetails.sh + fn_commandname elif [ "${postalert}" != "on" ]&&[ "${commandname}" == "TEST-ALERT" ]; then fn_print_warn_nl "More Info not enabled" fn_script_log_warn "More Info alerts not enabled" diff --git a/lgsm/functions/check_last_update.sh b/lgsm/functions/check_last_update.sh index 52e4cfce0..08343e560 100644 --- a/lgsm/functions/check_last_update.sh +++ b/lgsm/functions/check_last_update.sh @@ -20,5 +20,6 @@ if [ -f "${lockdir}/lastupdate.lock" ]&&[ "${status}" != "0" ]; then fn_print_info "${selfname} has not been restarted since last update" fn_script_log_info "${selfname} has not been restarted since last update" command_restart.sh + fn_commandname fi fi diff --git a/lgsm/functions/check_version.sh b/lgsm/functions/check_version.sh index 6db78091d..a0b0bc50c 100644 --- a/lgsm/functions/check_version.sh +++ b/lgsm/functions/check_version.sh @@ -16,4 +16,5 @@ if [ -n "${modulesversion}" ]&&[ -n "${version}" ]&&[ "${version}" != "${modules fn_sleep_time fn_script_log_error "LinuxGSM Version mismatch: ${selfname}: ${version}: modules: ${modulesversion}" command_update_linuxgsm.sh + fn_commandname fi diff --git a/lgsm/functions/command_install.sh b/lgsm/functions/command_install.sh index a4a049878..23fdd3179 100644 --- a/lgsm/functions/command_install.sh +++ b/lgsm/functions/command_install.sh @@ -45,6 +45,7 @@ else install_ts3db.sh elif [ "${shortname}" == "mta" ]; then command_install_resources_mta.sh + fn_commandname fi fix.sh diff --git a/lgsm/functions/command_mods_remove.sh b/lgsm/functions/command_mods_remove.sh index 3e67fa867..e353e7ec6 100644 --- a/lgsm/functions/command_mods_remove.sh +++ b/lgsm/functions/command_mods_remove.sh @@ -126,6 +126,7 @@ if [ "${engine}" == "unity3d" ]&&[[ "${modprettyname}" == *"Oxide"* ]]; then fn_script_log "Validating to restore original ${gamename} files replaced by Oxide" exitbypass="1" command_validate.sh + fn_commandname unset exitbypass fi echo -e "${modprettyname} removed" diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh index 8d4ce1e2e..adc2be363 100644 --- a/lgsm/functions/command_monitor.sh +++ b/lgsm/functions/command_monitor.sh @@ -173,6 +173,7 @@ for queryattempt in {1..5}; do alert="restartquery" alert.sh command_restart.sh + fn_commandname core_exit.sh fi elif [ "${querymethod}" == "gamedig" ]; then diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh index 2f80d003f..ba25747cc 100644 --- a/lgsm/functions/command_ts3_server_pass.sh +++ b/lgsm/functions/command_ts3_server_pass.sh @@ -31,6 +31,7 @@ fn_serveradmin_password_set(){ ts3serverpass="1" exitbypass="1" command_start.sh + fn_commandname fn_print_ok_nl "New password applied" fn_script_log_pass "New ServerAdmin password applied" } @@ -42,13 +43,16 @@ if [ "${status}" != "0" ]; then # Stop any running server. exitbypass="1" command_stop.sh + fn_commandname fn_serveradmin_password_set parms="serveradmin_password=\"${newpassword}\" inifile=\"${servercfgfullpath}\" > /dev/null 2>&1" ts3serverpass="0" command_restart.sh + fn_commandname else fn_serveradmin_password_set command_stop.sh + fn_commandname fi core_exit.sh diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 843dc26a1..d423e0f4a 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -135,7 +135,7 @@ fn_info_message_gameserver_resource(){ echo -e "${lightyellow}Game Server Resource Usage${default}" fn_messages_separator { - if [ "${status}" == "1" ]; then + if [ "${status}" != "0" ]; then echo -e "${lightblue}CPU Used:\t${default}${cpuused}%${default}" echo -e "${lightblue}Mem Used:\t${default}${pmemused}%\t${memused}MB${default}" else @@ -1515,7 +1515,7 @@ fn_info_message_select_engine(){ elif [ "${shortname}" == "bf1942" ]; then fn_info_message_bf1942 elif [ "${shortname}" == "bfv" ]; then - fn_info_message_bfv + fn_info_message_bfv elif [ "${shortname}" == "rtcw" ]; then fn_info_message_rtcw elif [ "${shortname}" == "rust" ]; then diff --git a/lgsm/functions/install_modules.sh b/lgsm/functions/install_modules.sh index c512b69a3..39729fd23 100644 --- a/lgsm/functions/install_modules.sh +++ b/lgsm/functions/install_modules.sh @@ -14,3 +14,4 @@ cp "${tmpdir}/LinuxGSM-master/lgsm/functions"/*.sh "${functionsdir}" cp "${tmpdir}/LinuxGSM-master/lgsm/functions"/*.py "${functionsdir}" chmod +x "${functionsdir}"/* command_update_linuxgsm.sh +fn_commandname diff --git a/lgsm/functions/update_minecraft.sh b/lgsm/functions/update_minecraft.sh index bf898ea91..62cf6a80c 100644 --- a/lgsm/functions/update_minecraft.sh +++ b/lgsm/functions/update_minecraft.sh @@ -159,15 +159,18 @@ fn_update_minecraft_compare(){ command_start.sh exitbypass=1 command_stop.sh + fn_commandname # If server started. else fn_stop_warning exitbypass=1 command_stop.sh + fn_commandname exitbypass=1 fn_update_minecraft_dl exitbypass=1 command_start.sh + fn_commandname fi date +%s > "${lockdir}/lastupdate.lock" alert="update" diff --git a/lgsm/functions/update_minecraft_bedrock.sh b/lgsm/functions/update_minecraft_bedrock.sh index 2966980b0..1e22053a1 100644 --- a/lgsm/functions/update_minecraft_bedrock.sh +++ b/lgsm/functions/update_minecraft_bedrock.sh @@ -126,15 +126,18 @@ fn_update_minecraft_compare(){ command_start.sh exitbypass=1 command_stop.sh + fn_commandname # If server started. else fn_stop_warning exitbypass=1 command_stop.sh + fn_commandname exitbypass=1 fn_update_minecraft_dl exitbypass=1 command_start.sh + fn_commandname fi date +%s > "${lockdir}/lastupdate.lock" alert="update" diff --git a/lgsm/functions/update_mta.sh b/lgsm/functions/update_mta.sh index 0de1faab9..caf6bc57b 100644 --- a/lgsm/functions/update_mta.sh +++ b/lgsm/functions/update_mta.sh @@ -38,7 +38,6 @@ fn_update_mta_localbuild(){ fn_script_log_info "Forcing server restart" exitbypass=1 command_stop.sh - fn_commandname exitbypass=1 command_start.sh fn_commandname @@ -156,15 +155,18 @@ fn_update_mta_compare(){ command_start.sh exitbypass=1 command_stop.sh + fn_commandname # If server started. else fn_stop_warning exitbypass=1 command_stop.sh + fn_commandname exitbypass=1 fn_update_mta_dl exitbypass=1 command_start.sh + fn_commandname fi date +%s > "${lockdir}/lastupdate.lock" alert="update" diff --git a/lgsm/functions/update_mumble.sh b/lgsm/functions/update_mumble.sh index 982b7edb3..969913ba3 100644 --- a/lgsm/functions/update_mumble.sh +++ b/lgsm/functions/update_mumble.sh @@ -89,7 +89,6 @@ fn_update_mumble_compare(){ fn_update_mumble_dl exitbypass=1 command_start.sh - fn_commandname exitbypass=1 command_stop.sh fn_commandname diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh index 0b2612611..cfa6d6aa2 100644 --- a/lgsm/functions/update_steamcmd.sh +++ b/lgsm/functions/update_steamcmd.sh @@ -237,6 +237,7 @@ if [ "${forceupdate}" == "1" ]; then date +%s > "${lockdir}/lastupdate.lock" exitbypass=1 command_start.sh + fn_commandname else fn_update_steamcmd_dl date +%s > "${lockdir}/lastupdate.lock" diff --git a/lgsm/functions/update_ts3.sh b/lgsm/functions/update_ts3.sh index 889e773e6..5bcf14bff 100644 --- a/lgsm/functions/update_ts3.sh +++ b/lgsm/functions/update_ts3.sh @@ -42,7 +42,6 @@ fn_update_ts3_localbuild(){ fn_script_log_info "Forcing server restart" exitbypass=1 command_stop.sh - fn_commandname exitbypass=1 command_start.sh fn_commandname @@ -152,7 +151,6 @@ fn_update_ts3_compare(){ fn_update_ts3_dl exitbypass=1 command_start.sh - fn_commandname exitbypass=1 command_stop.sh fn_commandname