. /usr/share/grml-live/buildd/functions.sh || exit 1
# execute main grml-live
-grml_live_run
+grml_live_run || create_logs
# store logs on remote server
upload_logs
iso_details
# create logs for adding to mail, but only if it fails
-send_mail -e
+send_mail
# move the ISO to final destination
store_iso
RC_INFO=success
else
RC_INFO=error
+ return 1
fi
}
# send status mail:
send_mail() {
- # create logs only if using 'send_mail -e'
+ # create logs if using 'send_mail -e'
[ "$1" = "-e" ] && create_logs
# attach logs only if we have some:
[ -r "$ATTACHMENT" ] && MUTT_ATTACH="-a $ATTACHMENT" || MUTT_ATTACH=''
/var/log/grml-buildd.stderr /var/log/grml-buildd.stdout $ATTACHMENT
EOF " | \
- mutt -s "$SCRIPTNAME [${DATE}] - $RC_INFO" -a /var/log/grml-buildd.stderr -a /var/log/grml-buildd.stdout $MUTT_ATTACH "$RECIPIENT"
+ mutt -s "$SCRIPTNAME [${DATE}] - $RC_INFO" -a /var/log/grml-buildd.stderr $MUTT_ATTACH "$RECIPIENT"
}
# make sure we store the final iso:
we would get:
"mkisofs: Volume ID string too long (cur. XX max. 32 chars)."
- add buildd/execute.sh to further simplify buildd/*.sh setup
+ - send_mail(): do not append /var/log/grml-buildd.stdout by default
- -- Michael Prokop <mika@grml.org> Tue, 24 Feb 2009 00:12:01 +0100
+ -- Michael Prokop <mika@grml.org> Tue, 24 Feb 2009 01:27:19 +0100
grml-live (0.9.9) unstable; urgency=low