Ralftar/email2 (#56)

* Update start.sh * Update wrapper.sh * Update VERSION
vendanor · Nov 28, 2023 · 2b4af96 · 2b4af96
1 parent a663d7f
commit 2b4af96
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.12
+0.0.13
diff --git a/scripts/start.sh b/scripts/start.sh
@@ -313,7 +313,12 @@ done
 
 # Send startup e-mail
 
-mail_body="CloudDump ${HOST} STARTED
+mail_body="CloudDump ${HOST}
+
+STARTED
+
+Debug: ${DEBUG}
+SMTP server: ${SMTPSERVER}
 
 "
 
@@ -330,15 +335,16 @@ JOBS
 ${jobs_summary}
 "
 
+mail_body="${mail_body}
+
+Vendanor CloudDump v${VERSION}"
+
 if [ "${MAIL}" = "mutt" ]; then
   echo "${mail_body}" | EMAIL="${MAILFROM} <${MAILFROM}>" ${MAIL} -s "[Started] CloudDump ${HOST}" "${MAILTO}" || exit 1
 else
   echo "${mail_body}" | ${MAIL} -r "${MAILFROM} <${MAILFROM}>" -s "[Started] CloudDump ${HOST}" "${MAILTO}" || exit 1
 fi
 
-mail_body="${mail_body}
-
-CloudDump v${VERSION}"
 
 # Setup crontab
 

diff --git a/scripts/wrapper.sh b/scripts/wrapper.sh
@@ -458,7 +458,9 @@ fi
 
 attachments="${attachments} --"
 
-message="CloudDump ${HOST} JOB REPORT (${result_text})
+message="CloudDump ${HOST}
+
+JOB REPORT (${result_text})
 
 Script: ${SCRIPTFILENAME}
 ID: ${JOBID}