evolix/evomaintenance
21
0
Fork 0
Code Issues 10 Pull requests 2 Releases 6 Wiki Activity

refonte affichage stats commits

Browse source
This commit is contained in:
Jérémy Lecour 2018-09-10 22:43:47 +02:00
parent 2f249eda73
commit e67b65def2
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
evomaintenance.sh
View file

@ -68,17 +68,16 @@ 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
@ -92,9 +91,12 @@ 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")
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}/" | \
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}