[Debian-live-changes] r1942 - dists/trunk/live-webhelper/scripts

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-03 09:35:51 +0000 (Sun, 03 Jun 2007)
New Revision: 1942

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


Modified: dists/trunk/live-webhelper/scripts/cron
===================================================================
--- dists/trunk/live-webhelper/scripts/cron	2007-06-03 07:55:30 UTC (rev 1941)
+++ dists/trunk/live-webhelper/scripts/cron	2007-06-03 09:35:51 UTC (rev 1942)
@@ -130,15 +130,15 @@
 		mkdir -p "${TEMPDIR}"/"${BUILD}"
 
 		DATE_START="`date -R`"
-		echo "Begin: ${DATE_START}" > "${TEMPDIR}"/"${BUILD}"/log.txt
+		echo "Begin: ${DATE_START}" > "${TEMPDIR}"/"${BUILD}"/log
 
 		# Generating image
 		cd "${TEMPDIR}"/"${BUILD}"
-		make-live ${LIVE_OPTIONS} >> "${TEMPDIR}"/"${BUILD}"/log.txt 2>&1
+		make-live ${LIVE_OPTIONS} >> "${TEMPDIR}"/"${BUILD}"/log 2>&1
 		ERROR="${?}"
 
 		DATE_END="`date -R`"
-		echo "End: ${DATE_END}" >> "${TEMPDIR}"/"${BUILD}"/log.txt
+		echo "End: ${DATE_END}" >> "${TEMPDIR}"/"${BUILD}"/log
 
 		# Creating image directory
 		mkdir -p "${DESTDIR}"/"${BUILD}"
@@ -153,7 +153,7 @@
 			    -e "s/DATE_END/${DATE_END}/" \
 			    -e "s/STATUS/maybe-successful/" \
 			    -e "s#SERVER#${SERVER}#" \
-			"${TEMPLATES}"/mail.txt > "${DESTDIR}"/"${BUILD}"/mail.txt
+			"${TEMPLATES}"/mail.txt > "${DESTDIR}"/"${BUILD}"/mail
 		else
 			sed -e "s/BUILD/${BUILD}/g" \
 			    -e "s/EMAIL/${EMAIL}/" \
@@ -162,7 +162,7 @@
 			    -e "s/DATE_END/${DATE_END}/" \
 			    -e "s/STATUS/maybe-failed/" \
 			    -e "s#SERVER#${SERVER}#" \
-			"${TEMPLATES}"/mail.txt > "${DESTDIR}"/"${BUILD}"/mail.txt
+			"${TEMPLATES}"/mail.txt > "${DESTDIR}"/"${BUILD}"/mail
 		fi
 
 		# Moving binary image
@@ -181,15 +181,15 @@
 		mv "${TEMPDIR}"/"${BUILD}".build "${DESTDIR}"/"${BUILD}"/build
 
 		# Moving log
-		mv "${TEMPDIR}"/"${BUILD}"/log.txt "${DESTDIR}"/"${BUILD}"
+		mv "${TEMPDIR}"/"${BUILD}"/log "${DESTDIR}"/"${BUILD}"
 
 		# Generating md5sum
 		cd "${DESTDIR}"/"${BUILD}"
-		md5sum * > md5sum.txt
+		md5sum * > md5sum
 		cd "${OLDPWD}"
 
 		# Sending mail
-		cat "${DESTDIR}"/"${BUILD}"/mail.txt | /usr/sbin/sendmail -t
+		cat "${DESTDIR}"/"${BUILD}"/mail | /usr/sbin/sendmail -t
 
 		# Unmounting proc
 		if [ -f "${TEMPDIR}"/"${BUILD}"/debian-live/chroot/proc/version ]