Improving starting.sh installation

diff --git a/support/starting.sh b/support/starting.sh
index 9ae2a28ad10075f58354e60558d4e5d65cf329b8..cd0238b200131bdf2795a1f06557ec9b3b1e79e0 100755 (executable)
--- a/support/starting.sh
+++ b/support/starting.sh
@@ -6,6 +6,29 @@
 OS=$1           #set the OS Type
 #Hard coded variables
 export APPNAME=mailleur
+#----------------------------------------------------------------------
+#display code
+CURS_ZERO="\\033[0G"
+
+NORMAL="\\033[0;39m"         # Standard console grey
+SUCCESS="\\033[1;32m"        # Success is green
+WARNING="\\033[1;33m"        # Warnings are yellow
+FAILURE="\\033[1;31m"        # Failures are red
+INFO="\\033[1;36m"           # Information is light cyan
+BRACKET="\\033[1;34m"        # Brackets are blue
+
+# Use a colored prefix
+BMPREFIX="\t "
+SUCCESS_PREFIX="${SUCCESS}  *  ${NORMAL}"
+FAILURE_PREFIX="${FAILURE}*****${NORMAL}"
+WARNING_PREFIX="${WARNING} *** ${NORMAL}"
+SKIP_PREFIX="${INFO}  S  ${NORMAL}"
+
+SUCCESS_SUFFIX="${BRACKET}[${SUCCESS}  OK  ${BRACKET}]${NORMAL}"
+FAILURE_SUFFIX="${BRACKET}[${FAILURE} FAIL ${BRACKET}]${NORMAL}"
+WARNING_SUFFIX="${BRACKET}[${WARNING} WARN ${BRACKET}]${NORMAL}"
+SKIP_SUFFIX="${BRACKET}[${INFO} SKIP ${BRACKET}]${NORMAL}"
+
 #===============================================================
 #restarting a daemon
 #----------------------------------------------------------------------
@@ -14,13 +37,13 @@ sh_restart()
 
 {
 case "$OS" in 
-  osukiss      )
+  "osukiss"    )
     service $1 restart
     ;;
-  sysvinit     )
+  "sysvinit"   )
     service $1 restart
     ;;
-  systemd      )
+  "systemd"    )
     systemctl restart $1
     ;;
   *            )
@@ -36,13 +59,13 @@ sh_failure()
 
 {
 case "$OS" in
-  osukiss       )
-    echo Failure: $1
+  "osukiss"    )
+    echo [ FAIL ] $1
     ;;
-  sysvinit      )
-    echo Failure: $1
+  "sysvinit"   )
+    echo [ FAIL ] $1
     ;;
-  systemd       )
+  "systemd"       )
     echo -n $1 ; failure;
     ;;
   *             )
@@ -57,13 +80,13 @@ sh_warning()
 
 {
 case "$OS" in 
-  osukiss      )
-    echo Warning: $1
+  "osukiss"    )
+    echo [ WARNING ] $1
     ;;
-  sysvinit     )
-    echo Warning: $1
+  "sysvinit"   )
+    echo [ WARNING ] $1
     ;;
-  systemd      )
+  "systemd"    )
     echo -n $2 ; warning;
     ;;
   *            )
@@ -78,13 +101,14 @@ sh_success()
 
 {
 case "$OS" in 
-  osukiss      )
-    echo Success: $1
+  "osukiss"    )
+    /usr/bin/echo -n -e "${BMPREFIX}${@}"
+    /usr/bin/echo -e "${CURS_ZERO}${SUCCESS_SUFFIX}"
     ;;
-  sysvinit     )
-    echo Success: $1
+  "sysvinit"   )
+    echo [ OK ] $1
     ;;
-  systemd      )
+  "systemd"    )
     echo -n $1 ; success;
     ;;
   *            )
@@ -170,12 +194,11 @@ do_mkcert()
 {
 mkdir -p /etc/pki/$APPNAME
 if [ ! -f /etc/pki/$APPNAME/$APPNAME-cert.pem ] ; then
-  echo -n $"Preparing $APPNAME certificate: "
   /usr/lib/$APPNAME/support/dummy-cert.sh /etc/pki/$APPNAME/$APPNAME
   chown $APPNAME:mail                                  \
        /etc/pki/$APPNAME/$APPNAME-cert.pem             \
        /etc/pki/$APPNAME/$APPNAME-key.pem
-  sh_success $"certs generation"
+  sh_success $"Preparing $APPNAME server certificate"
   fi
 }
 #----------------------------------------------------------------------