From d00299426c847def042033ee3e2bbf74a9c4bbcd Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 24 Nov 2024 00:05:33 +0000 Subject: [PATCH] updating dev ui --- lgsm/modules/check_deps.sh | 2 +- lgsm/modules/command_dev_ui.sh | 108 ++++++++++++++++++++++------- lgsm/modules/command_wipe.sh | 4 +- lgsm/modules/core_dl.sh | 2 +- lgsm/modules/core_messages.sh | 10 +-- lgsm/modules/install_server_dir.sh | 1 + 6 files changed, 94 insertions(+), 33 deletions(-) diff --git a/lgsm/modules/check_deps.sh b/lgsm/modules/check_deps.sh index 6fb4d66d3..dded9cc2f 100644 --- a/lgsm/modules/check_deps.sh +++ b/lgsm/modules/check_deps.sh @@ -83,7 +83,7 @@ fn_install_mono_repo() { fn_print_failure_nl "Unable to install Mono repository." fn_script_log_fail "Unable to install Mono repository." else - fn_print_complete_nl "Installing Mono repository completed." + fn_print_success_nl "Installing Mono repository completed." fn_script_log_pass "Installing Mono repository completed." fi fi diff --git a/lgsm/modules/command_dev_ui.sh b/lgsm/modules/command_dev_ui.sh index 7ea788b5c..c7ee17220 100644 --- a/lgsm/modules/command_dev_ui.sh +++ b/lgsm/modules/command_dev_ui.sh @@ -15,31 +15,91 @@ fn_print_header # Load ANSI colors fn_ansi_loader -echo -e "" -echo -e "${lightgreen}Colours${default}" +fn_print_nl "" +fn_print_nl "${lightgreen}Colours${default}" fn_messages_separator # Print supported colors -echo -e "${default}default" -echo -e "${black}black${default}" -echo -e "${red}red${default}" -echo -e "${lightred}lightred${default}" -echo -e "${green}green${default}" -echo -e "${lightgreen}lightgreen${default}" -echo -e "${yellow}yellow${default}" -echo -e "${lightyellow}lightyellow${default}" -echo -e "${blue}blue${default}" -echo -e "${lightblue}lightblue${default}" -echo -e "${magenta}magenta${default}" -echo -e "${lightmagenta}lightmagenta${default}" -echo -e "${cyan}cyan${default}" -echo -e "${lightcyan}lightcyan${default}" -echo -e "${darkgrey}darkgrey${default}" -echo -e "${lightgrey}lightgrey${default}" -echo -e "${white}white${default}" -echo -e "${bold}bold${default}" -echo -e "${dim}dim${default}" -echo -e "${italic}italic${default}" -echo -e "${underline}underline${default}" -echo -e "${reverse}reverse${default}" +fn_print_nl "${default}default" +fn_print_nl "${black}black${default}" +fn_print_nl "${red}red${default}" +fn_print_nl "${lightred}lightred${default}" +fn_print_nl "${green}green${default}" +fn_print_nl "${lightgreen}lightgreen${default}" +fn_print_nl "${yellow}yellow${default}" +fn_print_nl "${lightyellow}lightyellow${default}" +fn_print_nl "${blue}blue${default}" +fn_print_nl "${lightblue}lightblue${default}" +fn_print_nl "${magenta}magenta${default}" +fn_print_nl "${lightmagenta}lightmagenta${default}" +fn_print_nl "${cyan}cyan${default}" +fn_print_nl "${lightcyan}lightcyan${default}" +fn_print_nl "${darkgrey}darkgrey${default}" +fn_print_nl "${lightgrey}lightgrey${default}" +fn_print_nl "${white}white${default}" +fn_print_nl "${bold}bold${default}" +fn_print_nl "${dim}dim${default}" +fn_print_nl "${italic}italic${default}" +fn_print_nl "${underline}underline${default}" +fn_print_nl "${reverse}reverse${default}" + +fn_print_nl "" +fn_print_nl "${lightgreen}Non Interactive UI Status Messages${default}" +fn_messages_separator +fn_print_nl "" +fn_print_nl "Print Message" +fn_print_nl "" +fn_print_nl "${lightgreen}Status Messages${default}" +fn_messages_separator +fn_print_dots_nl "Dots" +fn_print_ok_nl "OK" +fn_print_fail_nl "Fail" +fn_print_error_nl "Error" +fn_print_warn_nl "Warn" +fn_print_info_nl "Info" +fn_print_start_nl "Start" + +fn_print_nl "" +fn_print_nl "${lightgreen}Interactive UI Status Messages${default}" +fn_messages_separator +fn_print_success_nl +fn_print_failure_nl +fn_print_error2_nl +fn_print_warning_nl +fn_print_information_nl + +fn_print_nl "" +fn_print_nl "${lightgreen}EOL Status Messages${default}" +fn_messages_separator + +fn_print "Print yes message with eol" +fn_print_yes_eol_nl +fn_print "Print no message with eol" +fn_print_no_eol_nl +fn_print "Print ok message with eol" +fn_print_ok_eol_nl +fn_print "Print fail message with eol" +fn_print_fail_eol_nl +fn_print "Print error message with eol" +fn_print_error_eol_nl +fn_print "Print warn message with eol" +fn_print_wait_eol_nl +fn_print "Print info message with eol" +fn_print_warn_eol_nl +fn_print "Print querying message with eol" +fn_print_info_eol_nl +fn_print "Print checking message with eol" +fn_print_querying_eol_nl +fn_print "Print delay message with eol" +fn_print_checking_eol_nl +fn_print "Print canceled message with eol" +fn_print_delay_eol_nl +fn_print "Print removed message with eol" +fn_print_canceled_eol_nl +fn_print "Print update message with eol" +fn_print_removed_eol_nl +fn_print "Print skip message with eol" +fn_print_update_eol_nl +fn_print "Print skip message with eol" +fn_print_skip_eol_nl core_exit.sh diff --git a/lgsm/modules/command_wipe.sh b/lgsm/modules/command_wipe.sh index 5c70804a2..cde4898d6 100644 --- a/lgsm/modules/command_wipe.sh +++ b/lgsm/modules/command_wipe.sh @@ -165,7 +165,7 @@ if [ -n "$(find "${serveridentitydir}" -type f -name "*.map")" ] || [ -n "$(find fn_firstcommand_reset fn_wipe_files fn_wipe_random_seed - fn_print_complete_nl "${wipetype}" + fn_print_success_nl "${wipetype}" fn_script_log_pass "${wipetype}" alert="wipe" alert.sh @@ -175,7 +175,7 @@ if [ -n "$(find "${serveridentitydir}" -type f -name "*.map")" ] || [ -n "$(find else fn_wipe_files fn_wipe_random_seed - fn_print_complete_nl "${wipetype}" + fn_print_success_nl "${wipetype}" fn_script_log_pass "${wipetype}" alert="wipe" alert.sh diff --git a/lgsm/modules/core_dl.sh b/lgsm/modules/core_dl.sh index 208775518..72d50d69a 100644 --- a/lgsm/modules/core_dl.sh +++ b/lgsm/modules/core_dl.sh @@ -137,7 +137,7 @@ fn_dl_steamcmd() { fn_print_error2_nl "${commandaction} ${selfname}: ${remotelocation}: Exit code: ${exitcode}" fn_script_log_error "${commandaction} ${selfname}: ${remotelocation}: Exit code: ${exitcode}" else - fn_print_complete_nl "${commandaction} ${selfname}: ${remotelocation}" + fn_print_success_nl "${commandaction} ${selfname}: ${remotelocation}" fn_script_log_pass "${commandaction} ${selfname}: ${remotelocation}" fi diff --git a/lgsm/modules/core_messages.sh b/lgsm/modules/core_messages.sh index d92418b57..fefca76e6 100644 --- a/lgsm/modules/core_messages.sh +++ b/lgsm/modules/core_messages.sh @@ -229,14 +229,14 @@ fn_print_header() { fn_messages_separator } -# Complete! -fn_print_complete() { - echo -en "${green}Complete!${default} $*${default}" +# Success! +fn_print_success() { + echo -en "${green}Success!${default} $*${default}" fn_sleep_time } -fn_print_complete_nl() { - echo -e "${green}Complete!${default} $*${default}" +fn_print_success_nl() { + echo -e "${green}Success!${default} $*${default}" fn_sleep_time } diff --git a/lgsm/modules/install_server_dir.sh b/lgsm/modules/install_server_dir.sh index 3898f2b20..318e4bc80 100644 --- a/lgsm/modules/install_server_dir.sh +++ b/lgsm/modules/install_server_dir.sh @@ -14,6 +14,7 @@ echo -en "creating serverfiles directory [ ${italic}${serverfiles}${default} ]" if [ -d "${serverfiles}" ]; then fn_print_skip_eol_nl + echo -e "" echo -e "${italic}A game server is already exists at this location.${default}" else fn_print_ok_eol_nl