From 2f249eda7394be33f5c9e8ca6701ce430e2d9cc1 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Fri, 7 Sep 2018 15:03:25 +0200
Subject: [PATCH] log + mail des stats Git

---
 evomaintenance.sh  | 15 ++++++++++++---
 evomaintenance.tpl |  5 +++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/evomaintenance.sh b/evomaintenance.sh
index 7b2129b..61b1b53 100644
--- a/evomaintenance.sh
+++ b/evomaintenance.sh
@@ -53,6 +53,7 @@ echo "${BLOB}" >> "${LOGFILE}"
 
 # git commit
 GIT_BIN=$(command -v git)
+GIT_COMMITS=""
 
 if test -x "${GIT_BIN}"; then
     # loop on possible directories managed by GIT
@@ -66,13 +67,18 @@ if test -x "${GIT_BIN}"; then
               ${GIT_BIN} add --all
               ${GIT_BIN} commit --message "${TEXTE}" --author="${USER} <${USER}@evolix.net>" --quiet
               # Add the SHA to the log file if something has been committed
-              SHA=$(git rev-parse HEAD)
-              echo "${dir} : ${SHA}" >> "${LOGFILE}"
+              SHA=$(${GIT_BIN} rev-parse --short HEAD)
+              STATS=$(${GIT_BIN} show --stat | tail -1)
+              # append commit data, without empty lines
+              GIT_COMMITS=$(echo "${GIT_COMMITS}\n${GIT_DIR} : ${SHA} –${STATS}" | sed -e '/^$/d')
             fi
         fi
         # unset environment variables to prevent accidental influence on other git commands
         unset GIT_DIR GIT_WORK_TREE
     done
+    if [ -n "${GIT_COMMITS}" ]; then
+      echo "${GIT_COMMITS}" >> "${LOGFILE}"
+    fi
 fi
 
 # insert into PG
@@ -86,6 +92,9 @@ VALUES ('${HOSTNAME}','${USER}','${IP}','${BEGIN_DATE}',now(),'${SQL_TEXTE}') "
 # send mail
 SENDMAIL=$(command -v sendmail)
 
+MAIL_TEXTE=$(echo "${TEXTE}" | sed "s@/@\\\\\/@g")
+MAIL_GIT_COMMITS=$(echo "${GIT_COMMITS}" | sed "s@/@\\\\\/@g")
+
 cat /usr/share/scripts/evomaintenance.tpl | \
-    sed -e "s/__TO__/${EVOMAINTMAIL}/ ; s/__HOSTNAME__/${HOSTNAME}/ ; s/__USER__/${USER}/ ; s/__BEGIN_DATE__/${BEGIN_DATE}/ ; s/__TEXTE__/${TEXTE}/ ; s/__IP__/${IP}/ ; s/__FULLFROM__/${FULLFROM}/ ; s/__FROM__/${FROM}/ ; s/__URGENCYFROM__/${URGENCYFROM}/ ; s/__URGENCYTEL__/${URGENCYTEL}/" | \
+    sed -e "s/__TO__/${EVOMAINTMAIL}/ ; s/__HOSTNAME__/${HOSTNAME}/ ; s/__USER__/${USER}/ ; s/__BEGIN_DATE__/${BEGIN_DATE}/ ; s/__END_DATE__/${END_DATE}/ ; s/__GIT_COMMITS__/${MAIL_GIT_COMMITS}/ ; s/__TEXTE__/${MAIL_TEXTE}/ ; s/__IP__/${IP}/ ; s/__FULLFROM__/${FULLFROM}/ ; s/__FROM__/${FROM}/ ; s/__URGENCYFROM__/${URGENCYFROM}/ ; s/__URGENCYTEL__/${URGENCYTEL}/" | \
     ${SENDMAIL} -oi -t -f ${FROM}
diff --git a/evomaintenance.tpl b/evomaintenance.tpl
index ab529dd..5c8cbdc 100644
--- a/evomaintenance.tpl
+++ b/evomaintenance.tpl
@@ -13,8 +13,9 @@ Voici les renseignements sur l'intervention :
 Nom du serveur : __HOSTNAME__
 Personne ayant réalisée l'intervention : __USER__
 Intervention réalisée depuis : __IP__
-Date/heure du début de l'intervention : __BEGIN_DATE__
-
+Début de l'intervention : __BEGIN_DATE__
+Fin de l'intervention : __END_DATE__
+__GIT_COMMITS__
 
 ###
 Renseignements sur l'intervention :