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

[Richard Nelson]

Author: rjent-guest
Date: 2007-05-04 18:51:15 +0000 (Fri, 04 May 2007)
New Revision: 1253

Modified:
   dists/trunk/live-webbuilder/live-webbuilder
Log:
.lwb formatting.

Modified: dists/trunk/live-webbuilder/live-webbuilder
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder	2007-05-04 18:34:07 UTC (rev 1252)
+++ dists/trunk/live-webbuilder/live-webbuilder	2007-05-04 18:51:15 UTC (rev 1253)
@@ -60,7 +60,7 @@
 	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 '=' | head -n1`"
+	PACKAGES="`echo ${QUERY_STRING} | grep -oE '(^|[?&])packages=[0-9,a-z,A-Z,.,_,-,+]+' | sed 's/+/ /g' | cut -f 2 -d '=' | head -n1`"
 
 	# Set the build number
 	# This is crude but should get the average
@@ -76,11 +76,13 @@
 	#echo "`whoami`"
 	echo "EMAIL=\"${EMAIL}\"" > "${WORK_PATH}/${BUILD_ID}".lwb
 	echo "BINARY_IMAGE=\"${BINARY_IMAGE}\"" >> "${WORK_PATH}/${BUILD_ID}".lwb
-	echo "DISTRIBUTION=\"--distibution ${DISTRIBUTION}\"" >> "${WORK_PATH}/${BUILD_ID}".lwb
-	echo "FILESYSTEM=\"--filesystem: ${FILESYSTEM}\"" >> "${WORK_PATH}/${BUILD_ID}".lwb
-	echo "PACKAGES_LISTS=\"--packages-lists ${PACKAGES_LISTS}\"" >> "${WORK_PATH}/${BUILD_ID}".lwb
-	echo "PACKAGES=\"--packages ${PACKAGES}\"" >> "${WORK_PATH}/${BUILD_ID}".lwb
-
+	echo "DISTRIBUTION=\"${DISTRIBUTION}\"" >> "${WORK_PATH}/${BUILD_ID}".lwb
+	echo "FILESYSTEM=\"${FILESYSTEM}\"" >> "${WORK_PATH}/${BUILD_ID}".lwb
+	echo "PACKAGES_LISTS=\"${PACKAGES_LISTS}\"" >> "${WORK_PATH}/${BUILD_ID}".lwb
+	echo "PACKAGES=\"${PACKAGES}\"" >> "${WORK_PATH}/${BUILD_ID}".lwb
+	echo "MIRROR_BUILD=\"${MIRROR_BUILD}\"" >> "${WORK_PATH}/${BUILD_ID}".lwb
+	
+	# Below is a rough example for reference only.
 	#{ make-live -r ${WOKR_PATH}${BUILD_ID} --mirror-build ${MIRROR_BUILD} --packages-lists ${PACKAGES_LISTS} --binary-image ${BINARY_IMAGE} --distibution ${DISTRIBUTION} --filesystem ${FILESYSTEM} --packages "${PACKAGES}"; echo "Returned $? at $(date)"; } 2>&1 | mail -s "Your debian-live build with id - ${BUILD_ID}" ${EMAIL}
 fi