buildd: update rsync options, use FAI timestamp style

[grml-live.git] / buildd / functions.sh

diff --git a/buildd/functions.sh b/buildd/functions.sh
index 226b372..36d71e7 100755 (executable)
--- a/buildd/functions.sh
+++ b/buildd/functions.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 # 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>
@@ -23,7 +24,7 @@ type -p mutt 1>/dev/null 2>&1 || die "mutt binary not found. 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."
@@ -77,6 +78,7 @@ grml_live_run() {
      RC_INFO=success
   else
      RC_INFO=error
+     return 1
   fi
 }
 
@@ -88,8 +90,7 @@ create_logs() {
 # 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}"/
 }
 
@@ -104,7 +105,7 @@ iso_details() {
 
 # 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=''
@@ -139,7 +140,7 @@ See attached files:
 /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: