From 1391ced1fc1690a8b91b3e1593d6faf2353bbe01 Mon Sep 17 00:00:00 2001 From: "Jean-Marc Pigeon (Delson)" Date: Mon, 30 Jun 2025 10:21:02 -0400 Subject: [PATCH] Improving starting.sh shell script --- support/starting.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/support/starting.sh b/support/starting.sh index cd0238b..19a764d 100755 --- a/support/starting.sh +++ b/support/starting.sh @@ -60,10 +60,12 @@ sh_failure() { case "$OS" in "osukiss" ) - echo [ FAIL ] $1 + /usr/bin/echo -n -e "${BMPREFIX}${@}" + /usr/bin/echo -e "${CURS_ZERO}${FAILURE_SUFFIX}" ;; "sysvinit" ) - echo [ FAIL ] $1 + /usr/bin/echo -n -e "${BMPREFIX}${@}" + /usr/bin/echo -e "${CURS_ZERO}${FAILURE_SUFFIX}" ;; "systemd" ) echo -n $1 ; failure; @@ -81,10 +83,12 @@ sh_warning() { case "$OS" in "osukiss" ) - echo [ WARNING ] $1 + /usr/bin/echo -n -e "${BMPREFIX}${@}" + /usr/bin/echo -e "${CURS_ZERO}${WARNING_SUFFIX}" ;; "sysvinit" ) - echo [ WARNING ] $1 + /usr/bin/echo -n -e "${BMPREFIX}${@}" + /usr/bin/echo -e "${CURS_ZERO}${WARNING_SUFFIX}" ;; "systemd" ) echo -n $2 ; warning; @@ -106,7 +110,8 @@ case "$OS" in /usr/bin/echo -e "${CURS_ZERO}${SUCCESS_SUFFIX}" ;; "sysvinit" ) - echo [ OK ] $1 + /usr/bin/echo -n -e "${BMPREFIX}${@}" + /usr/bin/echo -e "${CURS_ZERO}${SUCCESS_SUFFIX}" ;; "systemd" ) echo -n $1 ; success; @@ -198,7 +203,7 @@ if [ ! -f /etc/pki/$APPNAME/$APPNAME-cert.pem ] ; then chown $APPNAME:mail \ /etc/pki/$APPNAME/$APPNAME-cert.pem \ /etc/pki/$APPNAME/$APPNAME-key.pem - sh_success $"Preparing $APPNAME server certificate" + sh_success $"Preparing $APPNAME server self-signed certificate" fi } #---------------------------------------------------------------------- -- 2.47.3