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

Mon May 7 20:12:08 UTC 2007

Author: daniel
Date: 2007-05-07 20:12:08 +0000 (Mon, 07 May 2007)
New Revision: 1377

Modified:
   dists/trunk/live-webbuilder/html/build.html
   dists/trunk/live-webbuilder/html/header.html
   dists/trunk/live-webbuilder/live-webbuilder
Log:


Modified: dists/trunk/live-webbuilder/html/build.html
===================================================================

--- dists/trunk/live-webbuilder/html/build.html	2007-05-07 20:01:33 UTC (rev 1376)
+++ dists/trunk/live-webbuilder/html/build.html	2007-05-07 20:12:08 UTC (rev 1377)
@@ -1,18 +1,18 @@
 <br />
 
-<h2>Your build id is ${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:
 </p>
 
 <p>
-	Email - ${EMAIL}<br />
-	--binary-image ${BINARY_IMAGE}<br />
-	--distibution ${DISTRIBUTION}<br />
-	--filesystem: ${FILESYSTEM}<br />
-	--packages-lists ${PACKAGES_LISTS}<br />
-	--packages ${PACKAGES}
+	Email - EMAIL<br />
+	--binary-image BINARY_IMAGE<br />
+	--distibution DISTRIBUTION<br />
+	--filesystem: FILESYSTEM<br />
+	--packages-lists PACKAGES_LISTS<br />
+	--packages PACKAGES
 </p>
 
 <h2>Thank you for your submission.</h2>

Modified: dists/trunk/live-webbuilder/html/header.html
===================================================================
--- dists/trunk/live-webbuilder/html/header.html	2007-05-07 20:01:33 UTC (rev 1376)
+++ dists/trunk/live-webbuilder/html/header.html	2007-05-07 20:12:08 UTC (rev 1377)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html>
 	<head>
-		<title>Debian Live Webbuilder ${VERSION}</title>
+		<title>Debian Live Webbuilder VERSION</title>
 		<link rel="icon" href="http://debian-live.alioth.debian.org/favicon.ico" type="image/ico">
 		<link rel="stylesheet" type="text/css" href="http://debian-live.alioth.debian.org/images/style.css" />
 		<meta http-equiv="content-type" content="text/html; charset=iso-8859-15">
@@ -21,5 +21,5 @@
 </div>
 
 <div id="maincontent" style="margin: 0 0 0 0;">
-	<h1>This is the webbuild interface ${VERSION} of the <a href="http://debian-live.alioth.debian.org/">Debian Live</a> project.</h1>
+	<h1>This is the webbuild interface VERSION of the <a href="http://debian-live.alioth.debian.org/">Debian Live</a> project.</h1>
 </div>

Modified: dists/trunk/live-webbuilder/live-webbuilder
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder	2007-05-07 20:01:33 UTC (rev 1376)
+++ dists/trunk/live-webbuilder/live-webbuilder	2007-05-07 20:12:08 UTC (rev 1377)
@@ -31,7 +31,7 @@
 
 # Start sending HTML with version number.
 # Replaced cat "${HTML}"/header.html with below for version number.
-sed "s|\${VERSION}|${VERSION}|g" "${HTML}"/header.html
+sed -e "s/VERSION/${VERSION}/g" "${HTML}"/header.html
 
 ##########################################
 # Collet the parms
@@ -66,10 +66,17 @@
 	# This is crude but should get the average
 	# site by until someone else wanted to mess
 	# with.
-	BUILD_ID="`date +%Y%m%d%H%M%S`"
+	BUILD_ID="`+%Y%m%d.%s`"
 
 	# Start sending HTML
-	cat "${HTML}"/build.html
+	sed -e "s/BUILD_ID/${BUILD_ID}/" \
+	    -e "s/EMAIL/${EMAIL}/" \
+	    -e "s/BINARY_IMAGE/${BINARY_IMAGE}/" \
+	    -e "s/DISTRIBUTION/${DISTRIBUTION}/" \
+	    -e "s/FILESYSTEM/${FILESYSTEM}/" \
+	    -e "s/PACKAGES_LISTS/${PACKAGES_LISTS}/" \
+	    -e "s/PACKAGES/${PACKAGES}/" \
+	"${HTML}"/build.html
 
 	# Set the variables to pass to the cron job
 	# for processing.


