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

[Daniel Baumann]

Author: daniel
Date: 2007-05-04 14:53:51 +0000 (Fri, 04 May 2007)
New Revision: 1239

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


Modified: dists/trunk/live-webbuilder/live-webbuilder.sh
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder.sh	2007-05-04 14:47:27 UTC (rev 1238)
+++ dists/trunk/live-webbuilder/live-webbuilder.sh	2007-05-04 14:53:51 UTC (rev 1239)
@@ -18,7 +18,7 @@
 
 # Send the HTTP headers
 echo "Content-type: text/html"
-echo ""
+echo
 
 # Start sending HTML
 cat "${HTML}"/header.html
@@ -28,7 +28,8 @@
 ##########################################
 #echo $QUERY_STRING
 
-if [ -z "${QUERY_STRING}" ]; then
+if [ -z "${QUERY_STRING}" ]
+then
 	# Generate the form since it looks like
 	# no parameters were detected being passed.
 	cat "${HTML}"/form.html
@@ -43,12 +44,12 @@
 	# 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`
-	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 "="`
+	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`"
+	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 '-'`"
 
 	##########################################
 	# Set the build number
@@ -56,7 +57,7 @@
 	# site by until someone else wanted to mess
 	# with.
 	##########################################
-	WWW_BUILD_ID=`date +%Y%m%d%H%M%S`
+	WWW_BUILD_ID="`date +%Y%m%d%H%M%S`"
 
 	##########################################
 	# Start sending HTML
@@ -67,7 +68,7 @@
 	# Set the variables to pass to the cron job
 	# for processing.
 	##########################################
-	echo `whoami`
+	echo "`whoami`"
 	echo "WWW_LIVE_PARAMETERS=\"${WWW_MAKE_LIVE_PARAMETERS}\"" > /tmp/${WWW_BUILD_ID}.wdl
 	echo "EMAIL=\"${EMAIL}\"" >> /tmp/${WWW_BUILD_ID}.wdl