From 3f5e0223391ba5c9e6f8070e0d7c2a061a13f986 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 6 Aug 2020 16:23:54 +0200 Subject: [PATCH] =?UTF-8?q?Application=20du=20m=C3=AAme=20code=20couleur?= =?UTF-8?q?=20aux=20scripts=20de=20runit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/20-cron/run | 2 +- service/30-apache2/run | 2 +- service/90-glpi_init/run | 2 +- service/template | 14 +++++++++++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/service/20-cron/run b/service/20-cron/run index 6e627a1..2c89471 100755 --- a/service/20-cron/run +++ b/service/20-cron/run @@ -1,7 +1,7 @@ #!/bin/sh . /etc/service/template -msglog "Starting Cron..." +msglog green "Starting Cron..." # Touch cron files to fix 'NUMBER OF HARD LINKS > 1' issue. See https://github.com/phusion/baseimage-docker/issues/198 touch -c /etc/crontab /etc/cron.*/* /var/spool/cron/crontabs/* exec /usr/sbin/cron -f diff --git a/service/30-apache2/run b/service/30-apache2/run index fe65c83..bb78cc5 100755 --- a/service/30-apache2/run +++ b/service/30-apache2/run @@ -1,5 +1,5 @@ #!/bin/sh . /etc/service/template -msglog "Starting Apache..." +msglog green "Starting Apache..." exec apache2-foreground diff --git a/service/90-glpi_init/run b/service/90-glpi_init/run index c721ff1..767ea4b 100755 --- a/service/90-glpi_init/run +++ b/service/90-glpi_init/run @@ -1,6 +1,6 @@ #!/bin/sh . /etc/service/template -msglog "Starting glpi_init.sh..." +msglog green "Starting glpi_init.sh..." /root/glpi_init.sh sleep infinity diff --git a/service/template b/service/template index 1b7e167..70543c1 100644 --- a/service/template +++ b/service/template @@ -1,7 +1,19 @@ NORMAL='\e[39m' RED='\e[31m' +GREEN='\e[32m' msglog() { + case "${1}" in + green) + TEXT_COLOR="${GREEN}" + ;; + red) + TEXT_COLOR="${RED}" + ;; + normal) + TEXT_COLOR="${NORMAL}" + ;; + esac DATE=$(date '+%Y %b %d %H:%M:%S') - echo ${DATE} ${RED}${@}${NORMAL} + echo ${DATE} ${TEXT_COLOR}${2}${NORMAL} }