diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 531b52516..0a5bb1667 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -73,7 +73,7 @@ fn_backup_stop_server(){ fn_script_log_warn "Although unlikely; creating a backup while ${selfname} is running might corrupt the backup" # Server is running and will be stopped if stoponbackup=on or unset. else - fn_print_stop_warning_backup + fn_print_stop_warning serverstopped="yes" exitbypass=1 command_stop.sh diff --git a/lgsm/functions/command_validate.sh b/lgsm/functions/command_validate.sh index ea630ead3..c21aacdbb 100644 --- a/lgsm/functions/command_validate.sh +++ b/lgsm/functions/command_validate.sh @@ -12,23 +12,26 @@ fn_commandname(){ fn_commandname fn_validate(){ - fn_script_log_warn "SteamCMD: Validate might overwrite some customised files" + fn_print_warn "${commandaction} server: Validate might overwrite some customised files" + fn_script_log_warn "${commandaction} server: Validate might overwrite some customised files" totalseconds=3 for seconds in {3..1}; do - fn_print_warn "SteamCMD: Validate might overwrite some customised files: ${totalseconds}" + fn_print_warn "${commandaction} server: Validate might overwrite some customised files: ${totalseconds}" totalseconds=$((totalseconds - 1)) sleep 1 if [ "${seconds}" == "0" ]; then break fi done + fn_print_warn_nl "${commandaction} server: Validate might overwrite some customised files" + fn_dl_steamcmd } fn_print_dots "SteamCMD" check.sh if [ "${status}" != "0" ]; then - fn_print_stop_warning_update + fn_print_stop_warning exitbypass=1 command_stop.sh fn_commandname diff --git a/lgsm/functions/core_messages.sh b/lgsm/functions/core_messages.sh index c35ecd9c1..7dddb1e1b 100644 --- a/lgsm/functions/core_messages.sh +++ b/lgsm/functions/core_messages.sh @@ -530,32 +530,17 @@ fn_print_ascii_logo(){ echo -e "" } -fn_print_stop_warning_update(){ - fn_print_warn "${commandaction} server: ${remotelocation}: ${selfname} will be stopped during update" - fn_script_log_warn "${commandaction} server: ${remotelocation}: ${selfname} will be stopped during update" +fn_print_stop_warning(){ + fn_print_warn "${commandaction} server: ${selfname} will be stopped" + fn_script_log_warn "${commandaction} server: ${selfname} will be stopped" totalseconds=3 for seconds in {3..1}; do - fn_print_warn "${commandaction} server: ${remotelocation}: ${selfname} will be stopped during update: ${totalseconds}" + fn_print_warn "${commandaction} server: ${selfname} will be stopped: ${totalseconds}" totalseconds=$((totalseconds - 1)) sleep 1 if [ "${seconds}" == "0" ]; then break fi done - fn_print_warn_nl "${commandaction} server: SteamCMD: ${selfname} will be stopped during update" -} - -fn_print_stop_warning_backup(){ - fn_print_warn "${commandaction} server: ${selfname} will be stopped during backup" - fn_script_log_warn "${commandaction} server: ${selfname} will be stopped during backup" - totalseconds=3 - for seconds in {3..1}; do - fn_print_warn "${commandaction} server: ${selfname} will be stopped during backup: ${totalseconds}" - totalseconds=$((totalseconds - 1)) - sleep 1 - if [ "${seconds}" == "0" ]; then - break - fi - done - fn_print_warn_nl "${commandaction} server: ${selfname} will be stopped during backup: ${totalseconds}" + fn_print_warn_nl "${commandaction} server: ${selfname} will be stopped" } diff --git a/lgsm/functions/update_factorio.sh b/lgsm/functions/update_factorio.sh index 6bcbc1812..69e33661a 100644 --- a/lgsm/functions/update_factorio.sh +++ b/lgsm/functions/update_factorio.sh @@ -100,7 +100,7 @@ fn_update_factorio_compare(){ command_stop.sh # If server started. else - fn_print_stop_warning_update + fn_print_stop_warning exitbypass=1 command_stop.sh exitbypass=1 diff --git a/lgsm/functions/update_minecraft.sh b/lgsm/functions/update_minecraft.sh index eb0be5b08..f4bc51259 100644 --- a/lgsm/functions/update_minecraft.sh +++ b/lgsm/functions/update_minecraft.sh @@ -159,7 +159,7 @@ fn_update_minecraft_compare(){ command_stop.sh # If server started. else - fn_print_stop_warning_update + fn_print_stop_warning exitbypass=1 command_stop.sh exitbypass=1 diff --git a/lgsm/functions/update_minecraft_bedrock.sh b/lgsm/functions/update_minecraft_bedrock.sh index a73f46739..9b38e3cb1 100644 --- a/lgsm/functions/update_minecraft_bedrock.sh +++ b/lgsm/functions/update_minecraft_bedrock.sh @@ -125,7 +125,7 @@ fn_update_minecraft_compare(){ command_stop.sh # If server started. else - fn_print_stop_warning_update + fn_print_stop_warning exitbypass=1 command_stop.sh exitbypass=1 diff --git a/lgsm/functions/update_mta.sh b/lgsm/functions/update_mta.sh index 4c6505a60..6dab23c73 100644 --- a/lgsm/functions/update_mta.sh +++ b/lgsm/functions/update_mta.sh @@ -156,7 +156,7 @@ fn_update_mta_compare(){ command_stop.sh # If server started. else - fn_print_stop_warning_update + fn_print_stop_warning exitbypass=1 command_stop.sh exitbypass=1 diff --git a/lgsm/functions/update_mumble.sh b/lgsm/functions/update_mumble.sh index f68ac3b2c..ddcb65208 100644 --- a/lgsm/functions/update_mumble.sh +++ b/lgsm/functions/update_mumble.sh @@ -93,7 +93,7 @@ fn_update_mumble_compare(){ command_stop.sh # If server started. else - fn_print_stop_warning_update + fn_print_stop_warning exitbypass=1 command_stop.sh exitbypass=1 diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh index f8d4540ee..f78910dff 100644 --- a/lgsm/functions/update_steamcmd.sh +++ b/lgsm/functions/update_steamcmd.sh @@ -185,7 +185,7 @@ fn_update_steamcmd_compare(){ fn_update_steamcmd_dl # If server started. else - fn_print_stop_warning_update + fn_print_stop_warning exitbypass=1 command_stop.sh exitbypass=1 @@ -274,7 +274,7 @@ fn_print_dots "${remotelocation}" if [ "${forceupdate}" == "1" ]; then # forceupdate bypasses update checks. if [ "${status}" != "0" ]; then - fn_print_stop_warning_update + fn_print_stop_warning exitbypass=1 command_stop.sh fn_commandname diff --git a/lgsm/functions/update_ts3.sh b/lgsm/functions/update_ts3.sh index c7b297313..1d0d7d576 100644 --- a/lgsm/functions/update_ts3.sh +++ b/lgsm/functions/update_ts3.sh @@ -154,7 +154,7 @@ fn_update_ts3_compare(){ command_stop.sh # If server started. else - fn_print_stop_warning_update + fn_print_stop_warning exitbypass=1 command_stop.sh exitbypass=1