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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-22 19:11:48 +0000 (Tue, 22 May 2007)
New Revision: 1609

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


Modified: dists/trunk/live-webbuilder/live-webbuilder
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder	2007-05-22 19:04:11 UTC (rev 1608)
+++ dists/trunk/live-webbuilder/live-webbuilder	2007-05-22 19:11:48 UTC (rev 1609)
@@ -55,13 +55,13 @@
 	# 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`"
+	EMAIL="`grep -oE '(^|[?&])email=[0-9,a-z,A-Z,.,%,-]+' ${QUERY_STRING} | sed 's/%40/@/g' | cut -f 2 -d '=' | head -n1`"
+	BINARY_IMAGE="`grep -oE '(^|[?&])binary_image=[a-z]+' ${QUERY_STRING} | cut -f 2 -d '=' | head -n1`"
+	DISTRIBUTION="`grep -oE '(^|[?&])distribution=[a-z]+' ${QUERY_STRING} | cut -f 2 -d '=' | head -n1`"
+	FILESYSTEM="`grep -oE '(^|[?&])filesystem=[0-9,a-z]+' ${QUERY_STRING} | cut -f 2 -d '=' | head -n1`"
+	ISO_VOLUME="`grep -oE '(^|[?&])iso_volume=[0-9,a-z,A-Z,.,_,-,+]+' ${QUERY_STRING} | sed 's/+/ /g' | cut -f 2 -d '=' | head -n1`"
+	PACKAGES_LISTS="`grep -oE '(^|[?&])packages_lists=[a-z]+' ${QUERY_STRING} | cut -f 2 -d '=' | head -n1`"
+	PACKAGES="`grep -oE '(^|[?&])packages=[0-9,a-z,A-Z,.,_,-,+]+' ${QUERY_STRING} | sed 's/+/ /g' | cut -f 2 -d '=' | head -n1`"
 
 	# Set the build number
 	# This is crude but should get the average
@@ -73,9 +73,9 @@
 	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/ISO_VOLUME/${ISO_VOLUME}/" \
 	    -e "s/PACKAGES_LISTS/${PACKAGES_LISTS}/" \
 	    -e "s/PACKAGES/${PACKAGES}/" \
 	"${HTML}"/build.html
@@ -83,6 +83,7 @@
 	# Set the variables to pass to the cron job
 	# for processing.
 	#echo "`whoami`"
+
 cat > "${TEMPDIR}"/"${BUILD_ID}".lwb << EOF
 BUILD_ID="${BUILD_ID}"
 EMAIL="${EMAIL}"
@@ -93,6 +94,7 @@
 PACKAGES_LISTS="${PACKAGES_LISTS}"
 PACKAGES="${PACKAGES}"
 EOF
+
 fi
 
-sed -e "s/VERSION/${VERSION}/g" "${HTML}"/footer.html
+sed -e "s/VERSION/${VERSION}/" "${HTML}"/footer.html