[ -n "$OUTPUT_DIR" ] || OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
[ -n "$ISO_DIR" ] || ISO_DIR=$STORAGE/grml-isos
[ -n "$RECIPIENT" ] || RECIPIENT=root@localhost
-[ -n "$ATTACHMENT" ] || ATTACHMENT="$TMP_DIR/grml-live-logs_$DATE.tar.gz"
[ -n "$FROM" ] || FROM=root@localhost
[ -n "$ARCH" ] || ARCH="$(dpkg --print-architecture)"
+ATTACHMENT="$TMP_DIR/grml-live-logs_$DATE.tar.gz"
if [ -n "$LOGFILE" ] ; then
GRML_LOGFILE="$LOGFILE"
fi
[ -n "$FAI_LOGFILES" ] || FAI_LOGFILES=/var/log/fai/grml/last
-
echo "my_hdr From: grml-live autobuild daemon <$FROM>" > $MUTT_HEADERS
# execute grml-live:
case $SUITE in
sid) CODENAME=sid ;;
squeeze) CODENAME=squ ;;
+ wheezy) CODENAME=wheez ;;
lenny) CODENAME=lenny ;;
etch) CODENAME=etch ;;
esac
grml-live -F $* -a $ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
-g "$grml_name" -v "$shortdate" -r grml-live-autobuild -i $ISO_NAME \
- 1>/var/log/grml-buildd.stdout \
+ >/var/log/grml-buildd.stdout \
2>/var/log/grml-buildd.stderr ; RC=$?
if [ "$RC" = "0" ] ; then
# create log archive:
create_logs() {
- ( cd / && tar zcf $ATTACHMENT $FAI_LOGFILES /var/log/grml-buildd.stderr /var/log/grml-buildd.stdout $GRML_LOGFILE 1>/dev/null )
+ ( cd / && tar zcf $ATTACHMENT $FAI_LOGFILES /var/log/grml-buildd.stderr /var/log/grml-buildd.stdout $GRML_LOGFILE >/dev/null )
}
# store logs on remote server:
send_mail() {
# 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=''
$(grep -i "Couldn't find.*package" $FAI_LOGFILES/software.log | sed 's/\(.*\)"\(.*\)"\(.*\)/\2/' | sort -u || echo "* nothing")
See attached files:
-/var/log/grml-buildd.stderr /var/log/grml-buildd.stdout $ATTACHMENT
+/var/log/grml-buildd.stderr $ATTACHMENT
-EOF " | \
- mutt -s "$SCRIPTNAME [${DATE}] - $RC_INFO" -a /var/log/grml-buildd.stderr $MUTT_ATTACH "$RECIPIENT"
+EOF" | \
+ mutt -s "$SCRIPTNAME [${DATE}] - $RC_INFO" -a /var/log/grml-buildd.stderr $MUTT_ATTACH -- "$RECIPIENT"
}
# make sure we store the final iso:
# allow clean exit:
bailout() {
if [ "$RC" = "0" ] ; then
- rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR"
+ rm -rf "$ATTACHMENT" "$TMP_DIR" "$OUTPUT_DIR" "$MUTT_HEADERS"
else
- rm -f "$MUTT_HEADERS"
+ rm -f "$ATTACHMENT" "$MUTT_HEADERS"
echo "building ISO failed, keeping build files [${OUTPUT_DIR} / ${TMP_DIR}]">&2
fi