+#!/bin/bash
# Filename: /usr/share/grml-live/buildd/functions.sh
# Purpose: main function file for grml-live buildd
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
. /etc/grml/grml-buildd.conf || die "Could not source /etc/grml/grml-buildd.conf. Exiting."
-type -p mutt 1>/dev/null 2>&1 || die "mutt binary not found. Exiting."
+which mutt >/dev/null 2>&1 || die "mutt binary not found. Exiting."
# exit if important variables aren't set:
[ -n "$STORAGE" ] || die "\$STORAGE is not set. Exiting."
# some defaults:
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
-DATE="$(date +%Y%m%d)"
+DATE=$(date +'%Y%m%d_%H%M%S')
TMP_DIR="$(mktemp -d)"
MUTT_HEADERS="$(mktemp)"
[ -n "$TMP_DIR" ] || die "Could not create \$TMP_DIR. Exiting."
[ -n "$MUTT_HEADERS" ] || die "Could not create $\MUTT_HEADERS. Exiting."
-[ -n "$ARCH" ] && GRML_LIVE_ARCH="-a $ARCH"
# make sure we have same safe defaults:
[ -n "$OUTPUT_DIR" ] || OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
[ -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)"
if [ -n "$LOGFILE" ] ; then
GRML_LOGFILE="$LOGFILE"
grml_name="$NAME-daily-$CODENAME"
shortdate="$(date +%y%m%d)"
- grml-live -F $* $GRML_LIVE_ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
+ 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 \
2>/var/log/grml-buildd.stderr ; RC=$?
RC_INFO=success
else
RC_INFO=error
+ return 1
fi
}
# store logs on remote server:
upload_logs() {
[ -n "$RSYNC_MIRROR" ] || return 1
- umask 002
- rsync --exclude dmesg.log --times --partial --copy-links -az --quiet /var/log/grml-buildd.* \
+ rsync --exclude dmesg.log --times --partial --copy-links -rltDz --quiet /var/log/grml-buildd.* \
$FAI_LOGFILES $GRML_LOGFILE $RSYNC_MIRROR/logs/"${NAME}_${DATE}"/
}
# 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: