variables de commandes

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
@@ -68,21 +70,20 @@ if test -x "${GIT_BIN}"; then
               ${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_BIN} rev-parse --short HEAD)
-              STATS=$(${GIT_BIN} show --stat | tail -1)
+              FULL_STATS=$(${GIT_BIN} show --stat --oneline)
+              SHORT_STATS=$(echo "${FULL_STATS}" | tail -1 | sed -e 's/^ //')
               # append commit data, without empty lines
-              GIT_COMMITS=$(echo "${GIT_COMMITS}\n${GIT_DIR} : ${SHA} –${STATS}" | sed -e '/^$/d')
+              echo "${GIT_DIR} : ${SHA} – ${SHORT_STATS}" >> "${LOGFILE}"
+              GIT_COMMITS=$(echo "${GIT_COMMITS}\n###\nCommit sur ${GIT_WORK_TREE}\n${FULL_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
-SQL_TEXTE=`echo "${TEXTE}" | sed "s/'/\\\\\\'/g ; s@/@\\\\\/@g ; s@\\&@et@g"`
+SQL_TEXTE=$(echo "${TEXTE}" | sed "s/'/''/g")
 
 echo "
 INSERT INTO evomaint(hostname,userid,ipaddress,begin_date,end_date,details)
@@ -90,11 +91,13 @@ VALUES ('${HOSTNAME}','${USER}','${IP}','${BEGIN_DATE}',now(),'${SQL_TEXTE}') "
     psql ${PGDB} ${PGTABLE} -h ${PGHOST}
 
 # send mail
-SENDMAIL=$(command -v sendmail)
 
-MAIL_TEXTE=$(echo "${TEXTE}" | sed "s@/@\\\\\/@g")
-MAIL_GIT_COMMITS=$(echo "${GIT_COMMITS}" | sed "s@/@\\\\\/@g")
+MAIL_TEXTE="${TEXTE}"
+if [ -n "${GIT_COMMITS}" ]; then
+  MAIL_TEXTE="${MAIL_TEXTE}\n${GIT_COMMITS}"
+fi
+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/__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}
+    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_BIN} -oi -t -f ${FROM}