r2683 - dists/trunk/live-webhelper/scripts

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-08-04 17:45:50 +0000 (Sat, 04 Aug 2007)
New Revision: 2683

Modified:
   dists/trunk/live-webhelper/scripts/cron
Log:


Modified: dists/trunk/live-webhelper/scripts/cron
===================================================================
--- dists/trunk/live-webhelper/scripts/cron	2007-08-04 16:51:54 UTC (rev 2682)
+++ dists/trunk/live-webhelper/scripts/cron	2007-08-04 17:45:50 UTC (rev 2683)
@@ -163,25 +163,20 @@
 		# Creating mail
 		if [ "${ERROR}" -eq "0" ]
 		then
-			sed -e "s/BUILD/${BUILD}/g" \
-			    -e "s/EMAIL/${EMAIL}/" \
-			    -e "s/VERSION/${VERSION}/" \
-			    -e "s/DATE_START/${DATE_START}/" \
-			    -e "s/DATE_END/${DATE_END}/" \
-			    -e "s/STATUS/maybe-successful/" \
-			    -e "s#SERVER#${SERVER}#" \
-			"${TEMPLATES}"/mail.txt > "${DESTDIR}"/"${BUILD}"/mail
+			STATUS="maybe-successful"
 		else
-			sed -e "s/BUILD/${BUILD}/g" \
-			    -e "s/EMAIL/${EMAIL}/" \
-			    -e "s/VERSION/${VERSION}/" \
-			    -e "s/DATE_START/${DATE_START}/" \
-			    -e "s/DATE_END/${DATE_END}/" \
-			    -e "s/STATUS/maybe-failed/" \
-			    -e "s#SERVER#${SERVER}#" \
-			"${TEMPLATES}"/mail.txt > "${DESTDIR}"/"${BUILD}"/mail
+			STATUS="maybe-failed"
 		fi
 
+		sed -e "s/BUILD/${BUILD}/g" \
+		    -e "s/EMAIL/${EMAIL}/" \
+		    -e "s/VERSION/${VERSION}/" \
+		    -e "s/DATE_START/${DATE_START}/" \
+		    -e "s/DATE_END/${DATE_END}/" \
+		    -e "s/STATUS/${STATUS}/" \
+		    -e "s#SERVER#${SERVER}#" \
+		"${TEMPLATES}"/mail.txt > "${DESTDIR}"/"${BUILD}"/mail
+
 		# Moving binary image
 		if ls "${TEMPDIR}"/"${BUILD}"/debian-live/binary.* > /dev/null 2>&1
 		then
@@ -223,6 +218,6 @@
 		# Removing build directory
 		rm -rf "${TEMPDIR}"/"${BUILD}"
 
-		echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: end web build (${BUILD})." >> /var/log/live
+		echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: end web build (${BUILD}: ${STATUS})." >> /var/log/live
 	done
 fi