[Debian-live-changes] r1893 - dists/trunk/live-webhelper/scripts

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-31 06:08:06 +0000 (Thu, 31 May 2007)
New Revision: 1893

Modified:
   dists/trunk/live-webhelper/scripts/cgi
   dists/trunk/live-webhelper/scripts/cron
Log:


Modified: dists/trunk/live-webhelper/scripts/cgi
===================================================================
--- dists/trunk/live-webhelper/scripts/cgi	2007-05-30 22:00:45 UTC (rev 1892)
+++ dists/trunk/live-webhelper/scripts/cgi	2007-05-31 06:08:06 UTC (rev 1893)
@@ -61,7 +61,7 @@
 	EMAIL="`echo ${QUERY_STRING} | grep -oE '(^|[?&])email=[0-9,a-z,A-Z,.,%,-]+' | sed 's/%40/@/g' | cut -f 2 -d '=' | head -n1`"
 
 	# Standard options
-	BINARY_IMAGE="`echo ${QUERY_STRING} | grep -oE '(^|[?&])binary_image=[a-z]+' | cut -f 2 -d '=' | head -n1`"
+	BINARY_IMAGES="`echo ${QUERY_STRING} | grep -oE '(^|[?&])binary_images=[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`"
@@ -111,7 +111,7 @@
 	# Sending html confirmation
 	sed -e "s/BUILD/${BUILD}/" \
 	    -e "s/EMAIL/${EMAIL}/" \
-	    -e "s/BINARY_IMAGE/${BINARY_IMAGE}/" \
+	    -e "s/BINARY_IMAGES/${BINARY_IMAGES}/" \
 	    -e "s/DISTRIBUTION/${DISTRIBUTION}/" \
 	    -e "s/PACKAGES_LISTS/${PACKAGES_LISTS}/" \
 	    -e "s/PACKAGES/${PACKAGES}/" \
@@ -137,7 +137,7 @@
 
 EMAIL="${EMAIL}"
 
-BINARY_IMAGE="${BINARY_IMAGE}"
+BINARY_IMAGES="${BINARY_IMAGES}"
 DISTRIBUTION="${DISTRIBUTION}"
 PACKAGES_LISTS="${PACKAGES_LISTS}"
 PACKAGES="${PACKAGES}"

Modified: dists/trunk/live-webhelper/scripts/cron
===================================================================
--- dists/trunk/live-webhelper/scripts/cron	2007-05-30 22:00:45 UTC (rev 1892)
+++ dists/trunk/live-webhelper/scripts/cron	2007-05-31 06:08:06 UTC (rev 1893)
@@ -58,9 +58,9 @@
 		echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: begin web build (${BUILD})." >> /var/log/live
 
 		# Assembling standard options
-		if [ -n "${BINARY_IMAGE}" ]
+		if [ -n "${BINARY_IMAGES}" ]
 		then
-			LIVE_OPTIONS="${LIVE_OPTIONS} --binary-images ${BINARY_IMAGE}"
+			LIVE_OPTIONS="${LIVE_OPTIONS} --binary-images ${BINARY_IMAGES}"
 		fi
 
 		if [ -n "${DISTRIBUTION}" ]