X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=buildd%2Ffunctions.sh;h=a1e57dff56d677e2b8679d268170e9ae0d76ada4;hp=d5c65ef59d533468dd76e176e8f68b7c6edd6617;hb=19df4611c634f48c2ea0d321083e55bd0a2eeae4;hpb=39b0f86f3c8f5b5de57a365efce4541bb5c96fd9

diff --git a/buildd/functions.sh b/buildd/functions.sh
index d5c65ef..a1e57df 100755
--- a/buildd/functions.sh
+++ b/buildd/functions.sh
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Mon Oct 22 19:19:26 CEST 2007 [mika]
+# Latest change: Thu Oct 25 22:40:45 CEST 2007 [mika]
 ################################################################################
 
 die() {
@@ -33,46 +33,55 @@ MUTT_HEADERS=$(mktemp)
 [ -n "$ARCH" ] && GRML_LIVE_ARCH="-a $ARCH"
 
 # make sure we have same safe defaults:
-[ -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 "$LOGFILES" ]   || LOGFILES=/var/log/fai/dirinstall/grml
-[ -n "$FROM" ]       || FROM=root@localhost
+[ -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 "$FAI_LOGFILES" ]  || FAI_LOGFILES=/var/log/fai/dirinstall/grml
+[ -n "$GRML_LOGFILES" ] || GRML_LOGFILES=/var/log/grml-live/
+[ -n "$FROM" ]          || FROM=root@localhost
+
+[ -d "$FAI_LOGFILES" ]  || mkdir -p $FAI_LOGFILES
+[ -d "$GRML_LOGFILES" ] || mkdir -p $GRML_LOGFILES
 
 echo "my_hdr From: grml-live autobuild daemon <$FROM>" > $MUTT_HEADERS
 
 # execute grml-live:
 grml_live_run() {
-grml-live -F $GRML_LIVE_ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
-          -g $NAME -v $DATE -r grml-live-autobuild -i $ISO_NAME \
-	  1>$LOGFILES/grml-buildd.stdout \
-	  2>$LOGFILES/grml-buildd.stderr ; RC=$?
-
-if [ "$RC" = "0" ] ; then
-   RC_INFO=success
-else
-   RC_INFO=error
-fi
+  if [ -f "$ISO_DIR/$ISO_NAME" ] ; then
+     echo "$ISO_DIR/$ISO_NAME exists already. Nothing to be done, exiting."
+     exit 0
+  fi
+
+  grml-live -F $GRML_LIVE_ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
+            -g $NAME -v $DATE -r grml-live-autobuild -i $ISO_NAME \
+            1>$GRML_LOGFILES/grml-buildd.stdout \
+            2>$GRML_LOGFILES/grml-buildd.stderr ; RC=$?
+
+  if [ "$RC" = "0" ] ; then
+     RC_INFO=success
+  else
+     RC_INFO=error
+  fi
 }
 
 # create log archive:
 create_logs() {
-( cd / && tar zcf $ATTACHMENT var/log/fai/dirinstall/grml 1>/dev/null )
+  ( cd / && tar zcf $ATTACHMENT var/log/fai/dirinstall/grml 1>/dev/null )
 }
 
 # store information of ISO size:
 iso_details() {
-if ! [ -f "$OUTPUT_DIR/grml_isos/$ISO_NAME" ] ; then
-   ISO_DETAILS="There was an error creating $ISO_NAME"
-else
-   ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
-fi
+  if ! [ -f "$OUTPUT_DIR/grml_isos/$ISO_NAME" ] ; then
+     ISO_DETAILS="There was an error creating $ISO_NAME"
+  else
+     ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
+  fi
 }
 
 # send status mail:
 send_mail() {
-echo -en "Automatically generated mail by $SCRIPTNAME
+  echo -en "Automatically generated mail by $SCRIPTNAME
 
 $ISO_DETAILS
 
@@ -80,22 +89,24 @@ Return code of grml-live run was: $RC
 
 The following errors have been noticed (several might be warnings only):
 
-$(grep error $LOGFILES/* | grep -ve liberror -ve libgpg-error || echo "* nothing")
+$(grep error $FAI_LOGFILES/* | grep -ve liberror -ve libgpg-error || echo "* nothing")
 
 The following warnings have been noticed:
 
-$(grep warn $LOGFILES/* || echo "* nothing")
+$(grep warn $FAI_LOGFILES/* || echo "* nothing")
 
 Find details in the attached logs." | \
-mutt -s "$SCRIPTNAME [${DATE}] - $RC_INFO" \
-     -a $ATTACHMENT \
-     $RECIPIENT
+  mutt -s "$SCRIPTNAME [${DATE}] - $RC_INFO" \
+       -a $ATTACHMENT \
+       $RECIPIENT
 }
 
 # make sure we store the final iso:
 store_iso() {
-  [ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
-  mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+  if [ "$RC" = "0" ] ; then
+     [ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
+     mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+  fi
 }
 
 # allow clean exit: