From 6e37ad5821166a68942d22c6346f8d2121a34d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lecour?= <jlecour@evolix.fr>
Date: Mon, 10 Sep 2018 22:44:35 +0200
Subject: [PATCH] variables de commandes

---
 evomaintenance.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/evomaintenance.sh b/evomaintenance.sh
index 73228f6..ff55b51 100644
--- a/evomaintenance.sh
+++ b/evomaintenance.sh
@@ -15,6 +15,9 @@ test -f /etc/evomaintenance.cf && . /etc/evomaintenance.cf
 
 PATH=${PATH}:/usr/sbin
 
+SENDMAIL_BIN=$(command -v sendmail)
+GIT_BIN=$(command -v git)
+
 WHO=$(LC_ALL=C who -m)
 USER=$(echo ${WHO} | cut -d" " -f1)
 IP=$(echo ${WHO} | cut -d" " -f6  | sed -e "s/^(// ; s/)$//")
@@ -52,7 +55,6 @@ echo "----------- ${NOW_ISO} ---------------" >> "${LOGFILE}"
 echo "${BLOB}" >> "${LOGFILE}"
 
 # git commit
-GIT_BIN=$(command -v git)
 GIT_COMMITS=""
 
 if test -x "${GIT_BIN}"; then
@@ -89,7 +91,6 @@ VALUES ('${HOSTNAME}','${USER}','${IP}','${BEGIN_DATE}',now(),'${SQL_TEXTE}') "
     psql ${PGDB} ${PGTABLE} -h ${PGHOST}
 
 # send mail
-SENDMAIL=$(command -v sendmail)
 
 MAIL_TEXTE="${TEXTE}"
 if [ -n "${GIT_COMMITS}" ]; then
@@ -99,4 +100,4 @@ MAIL_TEXTE=$(echo "${MAIL_TEXTE}" | 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/__END_DATE__/${END_DATE}/ ; s/__TEXTE__/${MAIL_TEXTE}/ ; s/__IP__/${IP}/ ; s/__FULLFROM__/${FULLFROM}/ ; s/__FROM__/${FROM}/ ; s/__URGENCYFROM__/${URGENCYFROM}/ ; s/__URGENCYTEL__/${URGENCYTEL}/" | \
-    ${SENDMAIL} -oi -t -f ${FROM}
+    ${SENDMAIL_BIN} -oi -t -f ${FROM}