[Debian-live-changes] r1252 - in dists/trunk/live-webbuilder: . html

[Richard Nelson]

Author: rjent-guest
Date: 2007-05-04 18:34:07 +0000 (Fri, 04 May 2007)
New Revision: 1252

Modified:
   dists/trunk/live-webbuilder/html/build.html
   dists/trunk/live-webbuilder/live-webbuilder
Log:
Added dumping for .lwb in live-webbuilder and version display on header.

Modified: dists/trunk/live-webbuilder/html/build.html
===================================================================
--- dists/trunk/live-webbuilder/html/build.html	2007-05-04 16:33:10 UTC (rev 1251)
+++ dists/trunk/live-webbuilder/html/build.html	2007-05-04 18:34:07 UTC (rev 1252)
@@ -1,6 +1,6 @@
 <br />
 
-<h2>Your build id is ${WWW_BUILD_ID}. We shall begin the build attempt shortly. You will be notified when the attempt has completed.</h2>
+<h2>Your build id is ${BUILD_ID}. We shall begin the build attempt shortly. You will be notified when the attempt has completed.</h2>
 
 <p>
 	The parameters you submitted are:

Modified: dists/trunk/live-webbuilder/live-webbuilder
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder	2007-05-04 16:33:10 UTC (rev 1251)
+++ dists/trunk/live-webbuilder/live-webbuilder	2007-05-04 18:34:07 UTC (rev 1252)
@@ -20,29 +20,19 @@
 # On Debian systems, the complete text of the GNU General Public License
 # can be found in /usr/share/common-licenses/GPL file.
 
-
-##########################################
-# 20070503 Nelson
-# - Set version to 0.2.3
-# - Cleanup the expressions to work correct.
-# - Added some base values.
-# - Changed name to live-webbuilder to match svn granted by panthera.
-# 20070502 Nelson
-# - Set version to 0.2
-# - Get initial layout of idea.
-
 # Set some global the parameters
-VERSION="0.2.3"
-WWW_WORK_PATH="/tmp/"
-WWW_MIRROR_BUILD="http://localhost/debian"
+VERSION="0.2.4"
+WORK_PATH="/tmp"
+MIRROR_BUILD="http://localhost/debian"
 HTML="/usr/share/live-webbuilder/html"
 
 # Send the HTTP headers
 echo "Content-type: text/html"
 echo
 
-# Start sending HTML
-cat "${HTML}"/header.html
+# Start sending HTML with version number.
+# Replaced cat "${HTML}"/header.html with below for version number.
+sed "s|\${VERSION}|${VERSION}|g" "${HTML}"/header.html
 
 ##########################################
 # Collet the parms
@@ -70,30 +60,28 @@
 	DISTRIBUTION="`echo ${QUERY_STRING} | grep -oE '(^|[?&])distribution=[a-z]+' | cut -f 2 -d '=' | head -n1`"
 	FILESYSTEM="`echo ${QUERY_STRING} | grep -oE '(^|[?&])filesystem=[0-9,a-z]+' | cut -f 2 -d '=' | head -n1`"
 	PACKAGES_LISTS="`echo ${QUERY_STRING} | grep -oE '(^|[?&])packages_lists=[a-z]+' | cut -f 2 -d '=' | head -n1`"
-	PACKAGES="`echo ${QUERY_STRING} | grep -oE '(^|[?&])packages=[[0-9,a-z,A-Z,.,_,-]+' | sed 's/+/ /g' | cut -f 2 -d '-'`"
+	PACKAGES="`echo ${QUERY_STRING} | grep -oE '(^|[?&])packages=[0-9,a-z,A-Z,.,_,-]+' | sed 's/+/ /g' | cut -f 2 -d '=' | head -n1`"
 
-	##########################################
 	# Set the build number
 	# This is crude but should get the average
 	# site by until someone else wanted to mess
 	# with.
-	##########################################
-	WWW_BUILD_ID="`date +%Y%m%d%H%M%S`"
+	BUILD_ID="`date +%Y%m%d%H%M%S`"
 
-	##########################################
 	# Start sending HTML
-	##########################################
 	cat "${HTML}"/build.html
 
-	##########################################
 	# Set the variables to pass to the cron job
 	# for processing.
-	##########################################
-	echo "`whoami`"
-	echo "WWW_LIVE_PARAMETERS=\"${WWW_MAKE_LIVE_PARAMETERS}\"" > ${WWW_WOKR_PATH}${WWW_BUILD_ID}.lwb
-	echo "EMAIL=\"${EMAIL}\"" >> ${WWW_WOKR_PATH}${WWW_BUILD_ID}.lwb
+	#echo "`whoami`"
+	echo "EMAIL=\"${EMAIL}\"" > "${WORK_PATH}/${BUILD_ID}".lwb
+	echo "BINARY_IMAGE=\"${BINARY_IMAGE}\"" >> "${WORK_PATH}/${BUILD_ID}".lwb
+	echo "DISTRIBUTION=\"--distibution ${DISTRIBUTION}\"" >> "${WORK_PATH}/${BUILD_ID}".lwb
+	echo "FILESYSTEM=\"--filesystem: ${FILESYSTEM}\"" >> "${WORK_PATH}/${BUILD_ID}".lwb
+	echo "PACKAGES_LISTS=\"--packages-lists ${PACKAGES_LISTS}\"" >> "${WORK_PATH}/${BUILD_ID}".lwb
+	echo "PACKAGES=\"--packages ${PACKAGES}\"" >> "${WORK_PATH}/${BUILD_ID}".lwb
 
-	#{ make-live -r ${WWW_WOKR_PATH}${WWW_BUILD_ID} --mirror-build ${WWW_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 - ${WWW_BUILD_ID}" ${EMAIL}
+	#{ 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