From edee6c46534d3cccd77a1d3467c97f616ec8c953 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 8 Jul 2016 21:08:31 +0100 Subject: [PATCH] corrected nl bugs --- lgsm/functions/core_messages.sh | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/lgsm/functions/core_messages.sh b/lgsm/functions/core_messages.sh index e6552e422..532adfef6 100644 --- a/lgsm/functions/core_messages.sh +++ b/lgsm/functions/core_messages.sh @@ -86,6 +86,8 @@ fn_print_dots_nl(){ else echo -e "\r\033[K[ .... ] $@" fi + sleep 0.5 + echo -en "\n" } # [ OK ] @@ -99,11 +101,11 @@ fn_print_ok(){ fn_print_ok_nl(){ if [ -n "${commandaction}" ]; then - echo -e "\r\033[K[\e[0;32m OK \e[0m] ${commandaction} ${servicename}: $@" + echo -en "\r\033[K[\e[0;32m OK \e[0m] ${commandaction} ${servicename}: $@" else - echo -e "\r\033[K[\e[0;32m OK \e[0m] $@" + echo -en "\r\033[K[\e[0;32m OK \e[0m] $@" fi - sleep 1 + sleep 0.5 echo -en "\n" } @@ -118,11 +120,11 @@ fn_print_fail(){ fn_print_fail_nl(){ if [ -n "${commandaction}" ]; then - echo -e "\r\033[K[\e[0;31m FAIL \e[0m] ${commandaction} ${servicename}: $@" + echo -en "\r\033[K[\e[0;31m FAIL \e[0m] ${commandaction} ${servicename}: $@" else echo -en "\r\033[K[\e[0;31m FAIL \e[0m] $@" fi - sleep 1 + sleep 0.5 echo -en "\n" } @@ -137,11 +139,11 @@ fn_print_error(){ fn_print_error_nl(){ if [ -n "${commandaction}" ]; then - echo -e "\r\033[K[\e[0;31m ERROR \e[0m] ${commandaction} ${servicename}: $@" + echo -en "\r\033[K[\e[0;31m ERROR \e[0m] ${commandaction} ${servicename}: $@" else - echo -e "\r\033[K[\e[0;31m ERROR \e[0m] $@" + echo -en "\r\033[K[\e[0;31m ERROR \e[0m] $@" fi - sleep 1 + sleep 0.5 echo -en "\n" } @@ -156,11 +158,11 @@ fn_print_warn(){ fn_print_warn_nl(){ if [ -n "${commandaction}" ]; then - echo -e "\r\033[K[\e[1;33m WARN \e[0m] ${commandaction} ${servicename}: $@" + echo -en "\r\033[K[\e[1;33m WARN \e[0m] ${commandaction} ${servicename}: $@" else - echo -e "\r\033[K[\e[1;33m WARN \e[0m] $@" + echo -en "\r\033[K[\e[1;33m WARN \e[0m] $@" fi - sleep 1 + sleep 0.5 echo -en "\n" } @@ -175,11 +177,11 @@ fn_print_info(){ fn_print_info_nl(){ if [ -n "${commandaction}" ]; then - echo -e "\r\033[K[\e[0;36m INFO \e[0m] ${commandaction} ${servicename}: $@" + echo -en "\r\033[K[\e[0;36m INFO \e[0m] ${commandaction} ${servicename}: $@" else - echo -e "\r\033[K[\e[0;36m INFO \e[0m] $@" + echo -en "\r\033[K[\e[0;36m INFO \e[0m] $@" fi - sleep 1 + sleep 0.5 echo -en "\n" }