diff --git a/evomaintenance.sh b/evomaintenance.sh index 36d4e5b..97a8dff 100644 --- a/evomaintenance.sh +++ b/evomaintenance.sh @@ -132,8 +132,8 @@ PG_QUERY="INSERT INTO evomaint(hostname,userid,ipaddress,begin_date,end_date,det echo "${PG_QUERY}" | psql ${PGDB} ${PGTABLE} -h ${PGHOST} # send mail -MAIL_TEXTE=$(echo "${TEXTE}" | sed "s@/@\\\\\/@g") -MAIL_GIT_COMMITS=$(echo "${GIT_COMMITS}" | sed "s@/@\\\\\/@g") +MAIL_TEXTE=$(echo "${TEXTE}" | sed -e "s@/@\\\\\/@g ; s@&@\\\\&@") +MAIL_GIT_COMMITS=$(echo "${GIT_COMMITS}" | sed -e "s@/@\\\\\/@g ; s@&@\\\\&@") cat /usr/share/scripts/evomaintenance.tpl | \ sed -e "s/__TO__/${EVOMAINTMAIL}/ ; s/__HOSTNAME__/${HOSTNAME_TEXT}/ ; 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}/" | \