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

[Richard Nelson]

Author: rjent-guest
Date: 2007-05-07 16:01:28 +0000 (Mon, 07 May 2007)
New Revision: 1365

Modified:
   dists/trunk/live-webbuilder/live-webbuilder
   dists/trunk/live-webbuilder/webbuilder-cron
Log:
webbuilder-cron with cleanup, version, and directory log file.

Modified: dists/trunk/live-webbuilder/live-webbuilder
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder	2007-05-07 16:00:34 UTC (rev 1364)
+++ dists/trunk/live-webbuilder/live-webbuilder	2007-05-07 16:01:28 UTC (rev 1365)
@@ -21,7 +21,7 @@
 # can be found in /usr/share/common-licenses/GPL file.
 
 # Set some global the parameters
-VERSION="0.2.5"
+VERSION="0.2.6"
 TEMPDIR="/tmp"
 HTML="/usr/share/live-webbuilder/html"
 
@@ -54,6 +54,7 @@
 	# sed "s/%40/@/g" -> converts for @ symbol passed
 	# sed "s/%3A/:/g" -> converts for : sybmol passed
 	# sed "s/%2F/\//g" -> converts for / symbol passed
+
 	EMAIL="`echo ${QUERY_STRING} | grep -oE '(^|[?&])email=[0-9,a-z,A-Z,.,%,-]+' | sed 's/%40/@/g' | cut -f 2 -d '=' | head -n1`"
 	BINARY_IMAGE="`echo ${QUERY_STRING} | grep -oE '(^|[?&])binary_image=[a-z]+' | cut -f 2 -d '=' | head -n1`"
 	DISTRIBUTION="`echo ${QUERY_STRING} | grep -oE '(^|[?&])distribution=[a-z]+' | cut -f 2 -d '=' | head -n1`"
@@ -80,9 +81,7 @@
 	echo "FILESYSTEM=\"${FILESYSTEM}\"" >> "${TEMPDIR}/${BUILD_ID}".lwb
 	echo "PACKAGES_LISTS=\"${PACKAGES_LISTS}\"" >> "${TEMPDIR}/${BUILD_ID}".lwb
 	echo "PACKAGES=\"${PACKAGES}\"" >> "${TEMPDIR}/${BUILD_ID}".lwb
-	
-	# Below is a rough example for reference only.
-	#{ make-live -r ${WOKR_PATH}${BUILD_ID} --mirror-build ${MIRROR_BUILD} --packages-lists ${PACKAGES_LISTS} --binary-image ${BINARY_IMAGE} --distibution ${DISTRIBUTION} --filesystem ${FILESYSTEM} --packages "${PACKAGES}"; echo "Returned $? at $(date)"; } 2>&1 | mail -s "Your debian-live build with id - ${BUILD_ID}" ${EMAIL}
+
 fi
 
 cat "${HTML}"/footer.html

Modified: dists/trunk/live-webbuilder/webbuilder-cron
===================================================================
--- dists/trunk/live-webbuilder/webbuilder-cron	2007-05-07 16:00:34 UTC (rev 1364)
+++ dists/trunk/live-webbuilder/webbuilder-cron	2007-05-07 16:01:28 UTC (rev 1365)
@@ -11,10 +11,13 @@
 
 # Set some global parameters
 DESTDIR="/var/www/live-webbuilder"
-TEMPDIR="/tmp"
 MIRROR="http://localhost/debian/"
 MIRROR_IMAGE="http://localhost/debian/"
 MIRROR_SECURITY="http://ftp.us.debian.org/debian-security/"
+SITE_SERVER="http://localhost/live-webbuilder"
+TEMPDIR="/tmp"
+VERSION="0.1.0"
+MAILER=""
 
 # Check for webbuilder-cron.sh already running
 if [ ! -f "${TEMPDIR}"/lwb-lock ]
@@ -43,9 +46,15 @@
 		#echo ${FILESYSTEM}
 		#echo ${PACKAGES_LISTS}
 		#echo ${PACKAGES}
-
+		mkdir -p "${DESTDIR}"/${BUILD_ID}
+		cd "${DESTDIR}"/${BUILD_ID}
+		MAILER="Greetings,\nBeginning you build at: `date -R`"
+		echo "Begin: `date -R`"  > "${DESTDIR}"/${BUILD_ID}/log.txt
 		# Below is where we try to put is all together.
-		{ make-live --root "${DESTDIR}"/${BUILD_ID} --mirror-build ${MIRROR} --mirror-image ${MIRROR_IMAGE} --packages-lists ${PACKAGES_LISTS} --binary-image ${BINARY_IMAGE} --distribution ${DISTRIBUTION} --filesystem ${FILESYSTEM} --packages "${PACKAGES}"; echo "Returned $? at $(date)"; } 2>&1 | mail -s "Your debian-live build with id - ${BUILD_ID}" ${EMAIL}
+		make-live --root "${DESTDIR}"/${BUILD_ID} --mirror-build ${MIRROR} --mirror-image ${MIRROR_IMAGE} --packages-lists ${PACKAGES_LISTS} --binary-image ${BINARY_IMAGE} --distribution ${DISTRIBUTION} --filesystem ${FILESYSTEM} --packages "${PACKAGES}" >> "${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 od id - ${BUILD_ID}" ${EMAIL}
 
 		# Move the .lwb file to the target so we do not try to rebuild later
 		mv "${LWB}" "${DESTDIR}"/${BUILD_ID}