X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=buildd%2Ffunctions.sh;h=64d8fe4f42b907a69bceb2481ec5402402a966e1;hp=60a3b5af743e6e827964e768e544252cc6117e5c;hb=a135bda06bcf54ea195583637902c3f3fac05e4e;hpb=d2937b0d7bdc0b89aa3e856f696ffb2666936388 diff --git a/buildd/functions.sh b/buildd/functions.sh index 60a3b5a..64d8fe4 100755 --- a/buildd/functions.sh +++ b/buildd/functions.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/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 @@ -69,10 +69,10 @@ grml_live_run() { TIME_START=$(date +%s) grml-live -F $* -a $ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \ -g "$grml_name" -v "$shortdate" -r grml-live-autobuild -i $ISO_NAME \ - >/var/log/grml-buildd.stdout \ - 2>/var/log/grml-buildd.stderr ; RC=$? + >/var/log/grml-buildd.stdout.log \ + 2>/var/log/grml-buildd.stderr.log ; RC=$? TIME_END=$(date +%s) - let WALLTIME=$TIME_END-$TIME_START + WALLTIME=$(($TIME_END-$TIME_START)) if [ "$RC" = "0" ] ; then RC_INFO=success @@ -84,7 +84,7 @@ grml_live_run() { # create log archive: create_logs() { - ( cd / && tar zcfh $ATTACHMENT $FAI_LOGFILES /var/log/grml-buildd.stderr /var/log/grml-buildd.stdout $GRML_LOGFILE >/dev/null ) + ( cd / && tar zcfh $ATTACHMENT $FAI_LOGFILES /var/log/grml-buildd.stderr.log /var/log/grml-buildd.stdout $GRML_LOGFILE >/dev/null ) } # store logs on remote server: @@ -146,7 +146,7 @@ See attached files for further details. EOF" | \ mutt -e "my_hdr From: grml-live autobuild daemon <$FROM>" -s "$SCRIPTNAME [${DATE}] - $RC_INFO" \ - -a /var/log/grml-buildd.stderr $MUTT_ATTACH -- "$RECIPIENT" + -a /var/log/grml-buildd.stderr.log $MUTT_ATTACH -- "$RECIPIENT" } # make sure we store the final iso: