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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-22 20:25:13 +0000 (Tue, 22 May 2007)
New Revision: 1613

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


Modified: dists/trunk/live-webbuilder/live-webbuilder
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder	2007-05-22 20:23:48 UTC (rev 1612)
+++ dists/trunk/live-webbuilder/live-webbuilder	2007-05-22 20:25:13 UTC (rev 1613)
@@ -45,15 +45,15 @@
 	# Converting '/':	sed "s/%2F/\//g"
 
 	# Filtering url parameters
-	EMAIL="`grep -oE '(^|[?&])email=[0-9,a-z,A-Z,.,%,-]+' ${QUERY_STRING} | sed 's/%40/@/g' | cut -f 2 -d '=' | head -n1`"
+	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="`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`"
-	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`"
+	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`"
+	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`"
 
-	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`"
+	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`"
 
 	# FIXME: filter invalid options