[Debian-live-changes] r1610 - dists/trunk/live-webbuilder

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-22 19:14:55 +0000 (Tue, 22 May 2007)
New Revision: 1610

Modified:
   dists/trunk/live-webbuilder/cron
   dists/trunk/live-webbuilder/defaults
   dists/trunk/live-webbuilder/live-webbuilder
Log:


Modified: dists/trunk/live-webbuilder/cron
===================================================================
--- dists/trunk/live-webbuilder/cron	2007-05-22 19:11:48 UTC (rev 1609)
+++ dists/trunk/live-webbuilder/cron	2007-05-22 19:14:55 UTC (rev 1610)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# webbuilder-cron - cron for live-webbuilder a web-interface to make-live
+# live-webbuilder - web-interface to make-live
 # Copyright (C) 2007 Richard Nelson <rjent at rjent.pair.com>
 #
 # live-webbuilder comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -42,14 +42,6 @@
 do
 	# Pull in the meta file
 	. "${LWB}"
-	# Below are the current values that are expected to be their.
-	#echo ${BUILD_ID}
-	#echo ${EMAIL}
-	#echo ${BINARY_IMAGE}
-	#echo ${DISTRIBUTION}
-	#echo ${FILESYSTEM}
-	#echo ${PACKAGES_LISTS}
-	#echo ${PACKAGES}
 
 	# Assembling options
 	if [ -n "${BINARY_IMAGE}" ]
@@ -102,32 +94,32 @@
 		LIVE_OPTIONS="${LIVE_OPTIONS} --packages-lists ${PACKAGES_LISTS}"
 	fi
 
-	mkdir -p "${DESTDIR}"/${BUILD_ID}
-	cd "${DESTDIR}"/${BUILD_ID}
+	mkdir -p "${DESTDIR}"/${BUILD}
+	cd "${DESTDIR}"/${BUILD}
 	MAILER="Greetings,\nBeginning your build at: `date -R`"
-	echo "Begin: `date -R`"  > "${DESTDIR}"/${BUILD_ID}/log.txt
+	echo "Begin: `date -R`"  > "${DESTDIR}"/${BUILD}/log.txt
 
 	# Below is where we try to put is all together.
-	make-live --root "${DESTDIR}"/${BUILD_ID} ${LIVE_OPTIONS} >> "${DESTDIR}"/${BUILD_ID}/log.txt 2>&1
-	MAILER="${MAILER}\nEnding your build at: `date -R`\nTo download your debian-live build see ${SITE_SERVER}/${BUILD_ID} "
-	echo "Ending: `date -R`"  >> "${DESTDIR}"/${BUILD_ID}/log.txt
-	echo  ${MAILER} | mail -s "End build of id - ${BUILD_ID}" ${EMAIL}
+	make-live --root "${DESTDIR}"/${BUILD} ${LIVE_OPTIONS} >> "${DESTDIR}"/${BUILD}/log.txt 2>&1
+	MAILER="${MAILER}\nEnding your build at: `date -R`\nTo download your debian-live build see ${SITE_SERVER}/${BUILD} "
+	echo "Ending: `date -R`"  >> "${DESTDIR}"/${BUILD}/log.txt
+	echo  ${MAILER} | mail -s "End build of id - ${BUILD}" ${EMAIL}
 
 	# Move the .lwb file to the target so we do not try to rebuild later
-	mv "${LWB}" "${DESTDIR}"/${BUILD_ID}
+	mv "${LWB}" "${DESTDIR}"/${BUILD}
 
 	# Do cleanup after
-	#cd "${DESTDIR}"/${BUILD_ID}
+	#cd "${DESTDIR}"/${BUILD}
 	#lh_clean
 
 	# Unmount some things if still around
-	if [ -f "${DESTDIR}"/${BUILD_ID}/chroot/proc/version ]
+	if [ -f "${DESTDIR}"/${BUILD}/chroot/proc/version ]
 	then
-		umount "${DESTDIR}"/${BUILD_ID}/chroot/proc
+		umount "${DESTDIR}"/${BUILD}/chroot/proc
 	fi
 
-	if [ -d "${DESTDIR}"/${BUILD_ID}/chroot/sys/kernel ]
+	if [ -d "${DESTDIR}"/${BUILD}/chroot/sys/kernel ]
 	then
-		umount "${DESTDIR}"/${BUILD_ID}/chroot/sys
+		umount "${DESTDIR}"/${BUILD}/chroot/sys
 	fi
 done

Modified: dists/trunk/live-webbuilder/defaults
===================================================================
--- dists/trunk/live-webbuilder/defaults	2007-05-22 19:11:48 UTC (rev 1609)
+++ dists/trunk/live-webbuilder/defaults	2007-05-22 19:14:55 UTC (rev 1610)
@@ -11,4 +11,3 @@
 MIRROR_IMAGE_SECURITY="http://security.debian.org/"
 
 SITE_SERVER="http://localhost/live-webbuilder"
-MAILER=""

Modified: dists/trunk/live-webbuilder/live-webbuilder
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder	2007-05-22 19:11:48 UTC (rev 1609)
+++ dists/trunk/live-webbuilder/live-webbuilder	2007-05-22 19:14:55 UTC (rev 1610)
@@ -67,10 +67,10 @@
 	# This is crude but should get the average
 	# site by until someone else wanted to mess
 	# with.
-	BUILD_ID="`date +%Y%m%d.%s`"
+	BUILD="`date +%Y%m%d.%s`"
 
 	# Start sending HTML
-	sed -e "s/BUILD_ID/${BUILD_ID}/" \
+	sed -e "s/BUILD/${BUILD}/" \
 	    -e "s/EMAIL/${EMAIL}/" \
 	    -e "s/BINARY_IMAGE/${BINARY_IMAGE}/" \
 	    -e "s/DISTRIBUTION/${DISTRIBUTION}/" \
@@ -84,8 +84,8 @@
 	# for processing.
 	#echo "`whoami`"
 
-cat > "${TEMPDIR}"/"${BUILD_ID}".lwb << EOF
-BUILD_ID="${BUILD_ID}"
+cat > "${TEMPDIR}"/"${BUILD}".lwb << EOF
+BUILD="${BUILD}"
 EMAIL="${EMAIL}"
 BINARY_IMAGE="${BINARY_IMAGE}"
 ISO_VOLUME="${ISO_VOLUME}"