From 1f1c272e60ec949fe730ec8a3e6fa00646ce26e5 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 27 Sep 2023 00:11:40 +0100 Subject: [PATCH] refactor(core_messages): update print functions - Updated the print functions in the core_messages.sh file to improve readability and consistency. - Replaced the use of "tputreset" with "${default}" for better code clarity. - Modified the formatting of the output messages to follow a consistent pattern. - Removed unnecessary escape sequences from the echo statements. --- lgsm/modules/core_messages.sh | 56 +++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/lgsm/modules/core_messages.sh b/lgsm/modules/core_messages.sh index 6ec94f032..1d58d6b5a 100644 --- a/lgsm/modules/core_messages.sh +++ b/lgsm/modules/core_messages.sh @@ -128,18 +128,18 @@ fn_script_log_info() { # [ .... ] fn_print_dots() { if [ "${commandaction}" ]; then - echo -en "${bold}${creeol}[ .... ]${tputreset} ${commandaction} ${selfname}: $*" + echo -en "${bold}${creeol}[ .... ]${default} ${commandaction} ${selfname}: $*" else - echo -en "${bold}${creeol}[ .... ]${tputreset} $*" + echo -en "${bold}${creeol}[ .... ]${default} $*" fi fn_sleep_time } fn_print_dots_nl() { if [ "${commandaction}" ]; then - echo -e "${bold}${creeol}[ .... ]${tputreset} ${commandaction} ${selfname}: $*" + echo -e "${bold}${creeol}[ .... ]${default} ${commandaction} ${selfname}: $*" else - echo -e "${bold}${creeol}[ .... ]${tputreset} $*" + echo -e "${bold}${creeol}[ .... ]${default} $*" fi fn_sleep_time echo -en "\n" @@ -148,18 +148,18 @@ fn_print_dots_nl() { # [ OK ] fn_print_ok() { if [ "${commandaction}" ]; then - echo -en "${bold}${creeol}[${green} OK ${default}]${tputreset} ${commandaction} ${selfname}: $*" + echo -en "${bold}${creeol}[${green} OK ${default}]${default} ${commandaction} ${selfname}: $*" else - echo -en "${bold}${creeol}[${green} OK ${default}]${tputreset} $*" + echo -en "${bold}${creeol}[${green} OK ${default}]${default} $*" fi fn_sleep_time } fn_print_ok_nl() { if [ "${commandaction}" ]; then - echo -en "${bold}${creeol}[${green} OK ${default}]${tputreset} ${commandaction} ${selfname}: $*" + echo -en "${bold}${creeol}[${green} OK ${default}]${default} ${commandaction} ${selfname}: $*" else - echo -en "${bold}${creeol}[${green} OK ${default}]${tputreset} $*" + echo -en "${bold}${creeol}[${green} OK ${default}]${default} $*" fi fn_sleep_time echo -en "\n" @@ -168,18 +168,18 @@ fn_print_ok_nl() { # [ FAIL ] fn_print_fail() { if [ "${commandaction}" ]; then - echo -en "${bold}${creeol}[${red} FAIL ${default}]${tputreset} ${commandaction} ${selfname}: $*" + echo -en "${bold}${creeol}[${red} FAIL ${default}]${default} ${commandaction} ${selfname}: $*" else - echo -en "${bold}${creeol}[${red} FAIL ${default}]${tputreset} $*" + echo -en "${bold}${creeol}[${red} FAIL ${default}]${default} $*" fi fn_sleep_time } fn_print_fail_nl() { if [ "${commandaction}" ]; then - echo -en "${bold}${creeol}[${red} FAIL ${default}]${tputreset} ${commandaction} ${selfname}: $*" + echo -en "${bold}${creeol}[${red} FAIL ${default}]${default} ${commandaction} ${selfname}: $*" else - echo -en "${bold}${creeol}[${red} FAIL ${default}]${tputreset} $*" + echo -en "${bold}${creeol}[${red} FAIL ${default}]${default} $*" fi fn_sleep_time echo -en "\n" @@ -188,18 +188,18 @@ fn_print_fail_nl() { # [ ERROR ] fn_print_error() { if [ "${commandaction}" ]; then - echo -en "${bold}${creeol}[${red} ERROR ${default}]${tputreset} ${commandaction} ${selfname}: $*" + echo -en "${bold}${creeol}[${red} ERROR ${default}]${default} ${commandaction} ${selfname}: $*" else - echo -en "${bold}${creeol}[${red} ERROR ${default}]${tputreset} $*" + echo -en "${bold}${creeol}[${red} ERROR ${default}]${default} $*" fi fn_sleep_time } fn_print_error_nl() { if [ "${commandaction}" ]; then - echo -en "${bold}${creeol}[${red} ERROR ${default}]${tputreset} ${commandaction} ${selfname}: $*" + echo -en "${bold}${creeol}[${red} ERROR ${default}]${default} ${commandaction} ${selfname}: $*" else - echo -en "${bold}${creeol}[${red} ERROR ${default}]${tputreset} $*" + echo -en "${bold}${creeol}[${red} ERROR ${default}]${default} $*" fi fn_sleep_time echo -en "\n" @@ -208,18 +208,18 @@ fn_print_error_nl() { # [ WARN ] fn_print_warn() { if [ "${commandaction}" ]; then - echo -en "${bold}${creeol}[${lightyellow} WARN ${default}]${tputreset} ${commandaction} ${selfname}: $*" + echo -en "${bold}${creeol}[${lightyellow} WARN ${default}]${default} ${commandaction} ${selfname}: $*" else - echo -en "${bold}${creeol}[${lightyellow} WARN ${default}]${tputreset} $*" + echo -en "${bold}${creeol}[${lightyellow} WARN ${default}]${default} $*" fi fn_sleep_time } fn_print_warn_nl() { if [ "${commandaction}" ]; then - echo -en "${bold}${creeol}[${lightyellow} WARN ${default}]${tputreset} ${commandaction} ${selfname}: $*" + echo -en "${bold}${creeol}[${lightyellow} WARN ${default}]${default} ${commandaction} ${selfname}: $*" else - echo -en "${bold}${creeol}[${lightyellow} WARN ${default}]${tputreset} $*" + echo -en "${bold}${creeol}[${lightyellow} WARN ${default}]${default} $*" fi fn_sleep_time echo -en "\n" @@ -228,18 +228,18 @@ fn_print_warn_nl() { # [ INFO ] fn_print_info() { if [ "${commandaction}" ]; then - echo -en "${bold}${creeol}[${cyan} INFO ${default}] ${commandaction} ${selfname}:${tputreset} $*" + echo -en "${bold}${creeol}[${cyan} INFO ${default}] ${commandaction} ${selfname}:${default} $*" else - echo -en "${bold}${creeol}[${cyan} INFO ${default}]${tputreset} $*" + echo -en "${bold}${creeol}[${cyan} INFO ${default}]${default} $*" fi fn_sleep_time } fn_print_info_nl() { if [ "${commandaction}" ]; then - echo -en "${bold}${creeol}[${cyan} INFO ${default}] ${commandaction} ${selfname}:${tputreset} $*" + echo -en "${bold}${creeol}[${cyan} INFO ${default}] ${commandaction} ${selfname}:${default} $*" else - echo -en "${bold}${creeol}[${cyan} INFO ${default}]${tputreset} $*" + echo -en "${bold}${creeol}[${cyan} INFO ${default}]${default} $*" fi fn_sleep_time echo -en "\n" @@ -248,18 +248,18 @@ fn_print_info_nl() { # [ START ] fn_print_start() { if [ "${commandaction}" ]; then - echo -en "${bold}${creeol}[${lightgreen} START ${default}]${tputreset} ${commandaction} ${selfname}: $*" + echo -en "${bold}${creeol}[${lightgreen} START ${default}]${default} ${commandaction} ${selfname}: $*" else - echo -en "${bold}${creeol}[${lightgreen} START ${default}]${tputreset} $*" + echo -en "${bold}${creeol}[${lightgreen} START ${default}]${default} $*" fi fn_sleep_time } fn_print_start_nl() { if [ "${commandaction}" ]; then - echo -en "${bold}${creeol}[${lightgreen} START ${default}]${tputreset} ${commandaction} ${selfname}: $*" + echo -en "${bold}${creeol}[${lightgreen} START ${default}]${default} ${commandaction} ${selfname}: $*" else - echo -en "${bold}${creeol}[${lightgreen} START ${default}]${tputreset} $*" + echo -en "${bold}${creeol}[${lightgreen} START ${default}]${default} $*" fi fn_sleep_time echo -en "\n"