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

[Richard Nelson]

Author: rjent-guest
Date: 2007-05-13 00:37:32 +0000 (Sun, 13 May 2007)
New Revision: 1490

Modified:
   dists/trunk/live-webbuilder/Makefile
   dists/trunk/live-webbuilder/cron-webbuilder
   dists/trunk/live-webbuilder/html/build.html
   dists/trunk/live-webbuilder/html/form.html
   dists/trunk/live-webbuilder/live-webbuilder
Log:
iso-volume parameter added and bumped version.

Modified: dists/trunk/live-webbuilder/Makefile
===================================================================
--- dists/trunk/live-webbuilder/Makefile	2007-05-12 06:56:01 UTC (rev 1489)
+++ dists/trunk/live-webbuilder/Makefile	2007-05-13 00:37:32 UTC (rev 1490)
@@ -32,7 +32,7 @@
 	rm -rf $(DESTDIR)/usr/share/doc/live-webbuilder
 
 update:
-	sed -i -e 's/VERSION="0.2.6"/VERSION="0.2.x"/' live-webbuilder
+	sed -i -e 's/VERSION="0.2.7"/VERSION="0.2.x"/' live-webbuilder
 
 clean:
 

Modified: dists/trunk/live-webbuilder/cron-webbuilder
===================================================================
--- dists/trunk/live-webbuilder/cron-webbuilder	2007-05-12 06:56:01 UTC (rev 1489)
+++ dists/trunk/live-webbuilder/cron-webbuilder	2007-05-13 00:37:32 UTC (rev 1490)
@@ -51,7 +51,7 @@
 		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}" >> "${DESTDIR}"/${BUILD_ID}/log.txt 2>&1
+		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}" --iso-volume "${ISO_VOLUME}" >> "${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}

Modified: dists/trunk/live-webbuilder/html/build.html
===================================================================
--- dists/trunk/live-webbuilder/html/build.html	2007-05-12 06:56:01 UTC (rev 1489)
+++ dists/trunk/live-webbuilder/html/build.html	2007-05-13 00:37:32 UTC (rev 1490)
@@ -12,6 +12,7 @@
 <table>
 	<tr><td>Email: </td><td>EMAIL</td></tr>
 	<tr><td>--binary-image: </td><td>BINARY_IMAGE</td></tr>
+	<tr><td>--iso-volume: </td><td>ISO_VOLUME</td></tr>
 	<tr><td>--distribution: </td><td>DISTRIBUTION</td></tr>
 	<tr><td>--fileystem: </td><td>FILESYSTEM</td></tr>
 	<tr><td>--packages-lists: </td><td>PACKAGES_LISTS</td></tr>

Modified: dists/trunk/live-webbuilder/html/form.html
===================================================================
--- dists/trunk/live-webbuilder/html/form.html	2007-05-12 06:56:01 UTC (rev 1489)
+++ dists/trunk/live-webbuilder/html/form.html	2007-05-13 00:37:32 UTC (rev 1490)
@@ -28,6 +28,10 @@
 		</td>
 	</tr>
 	<tr>
+		<td><label for="ISO_Volume">--<u>i</u>so-volume:</label> </td>
+		<td><input accesskey="i" id="ISO_Volume" name="iso_volume" maxlength="200" size="50" type="text" /></td>
+	</tr>
+	<tr>
 		<td><label for="Distribution">--<u>d</u>istribution:</label> </td>
 		<td>
 			<select accesskey="d" id="Distribution" name="distribution" size="1">

Modified: dists/trunk/live-webbuilder/live-webbuilder
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder	2007-05-12 06:56:01 UTC (rev 1489)
+++ dists/trunk/live-webbuilder/live-webbuilder	2007-05-13 00:37:32 UTC (rev 1490)
@@ -21,7 +21,7 @@
 # can be found in /usr/share/common-licenses/GPL file.
 
 # Set some global the parameters
-VERSION="0.2.6"
+VERSION="0.2.7"
 TEMPDIR="/tmp"
 HTML="/usr/share/live-webbuilder/html"
 
@@ -54,11 +54,13 @@
 	# sed "s/%40/@/g" -> converts for @ symbol passed
 	# sed "s/%3A/:/g" -> converts for : sybmol passed
 	# sed "s/%2F/\//g" -> converts for / symbol passed
+	# --iso-volume  STRING
 
 	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`"
 	FILESYSTEM="`echo ${QUERY_STRING} | grep -oE '(^|[?&])filesystem=[0-9,a-z]+' | cut -f 2 -d '=' | head -n1`"
+	ISO_VOLUME="`echo ${QUERY_STRING} | grep -oE '(^|[?&])iso_volume=[0-9,a-z,A-Z,.,_,-,+]+' | sed 's/+/ /g' | 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 '=' | head -n1`"
 
@@ -72,6 +74,7 @@
 	sed -e "s/BUILD_ID/${BUILD_ID}/" \
 	    -e "s/EMAIL/${EMAIL}/" \
 	    -e "s/BINARY_IMAGE/${BINARY_IMAGE}/" \
+	    -e "s/ISO_VOLUME/${ISO_VOLUME}/" \
 	    -e "s/DISTRIBUTION/${DISTRIBUTION}/" \
 	    -e "s/FILESYSTEM/${FILESYSTEM}/" \
 	    -e "s/PACKAGES_LISTS/${PACKAGES_LISTS}/" \
@@ -85,6 +88,7 @@
 BUILD_ID="${BUILD_ID}"
 EMAIL="${EMAIL}"
 BINARY_IMAGE="${BINARY_IMAGE}"
+ISO_VOLUME="${ISO_VOLUME}"
 DISTRIBUTION="${DISTRIBUTION}"
 FILESYSTEM="${FILESYSTEM}"
 PACKAGES_LISTS="${PACKAGES_LISTS}"