[Debian-live-changes] r1238 - in dists/trunk/live-webbuilder: . html
Daniel Baumann
daniel at alioth.debian.org
Fri May 4 14:47:27 UTC 2007
Author: daniel
Date: 2007-05-04 14:47:27 +0000 (Fri, 04 May 2007)
New Revision: 1238
Modified:
dists/trunk/live-webbuilder/html/build.html
dists/trunk/live-webbuilder/html/form.html
dists/trunk/live-webbuilder/live-webbuilder.sh
Log:
Modified: dists/trunk/live-webbuilder/html/build.html
===================================================================
--- dists/trunk/live-webbuilder/html/build.html 2007-05-04 14:39:57 UTC (rev 1237)
+++ dists/trunk/live-webbuilder/html/build.html 2007-05-04 14:47:27 UTC (rev 1238)
@@ -7,12 +7,12 @@
</p>
<p>
- Email - ${WWW_REPLY_TO_EMAIL}<br />
- --packages-lists ${WWW_PACKAGES_LISTS}<br />
- --distibution ${WWW_DISTRIBUTION}<br />
- --binary-image ${WWW_BINARY_IMAGE}<br />
- --filesystem: ${WWW_FILESYSTEM}<br />
- --packages ${WWW_PACKAGES}
+ Email - ${EMAIL}<br />
+ --binary-image ${BINARY_IMAGE}<br />
+ --distibution ${DISTRIBUTION}<br />
+ --filesystem: ${FILESYSTEM}<br />
+ --packages-lists ${PACKAGES_LISTS}<br />
+ --packages ${PACKAGES}
</p>
<h2>Thank you for your submission.</h2>
Modified: dists/trunk/live-webbuilder/html/form.html
===================================================================
--- dists/trunk/live-webbuilder/html/form.html 2007-05-04 14:39:57 UTC (rev 1237)
+++ dists/trunk/live-webbuilder/html/form.html 2007-05-04 14:47:27 UTC (rev 1238)
@@ -10,36 +10,23 @@
<table>
<tr>
<td>* Email Address: </td>
- <td><input name="www_reply_to_email" size="50" /></td>
+ <td><input name="email" size="50" /></td>
</tr>
<tr>
- <td> --packages-lists: </td>
+ <td> --binary-image: </td>
<td>
- <select name="www_packages_lists" size="1" >
- <option value="gnome" SELECTED>gnome</option>
- <option value="gnome-core">gnome-core</option>
- <option value="gnome-full">gnome-full</option>
- <option value="gnome-junior">gnome-junior</option>
- <option value="gnustep">gnustep</option>
- <option value="kde">kde</option>
- <option value="kde-core">kde-core</option>
- <option value="kde-extra">kde-extra</option>
- <option value="kde-full">kde-full</option>
- <option value="kde-junior">kde-junior</option>
- <option value="mini">mini</option>
- <option value="minimal">minimal</option>
- <option value="rescue">rescue</option>
- <option value="standard">standard</option>
- <option value="standard-x11">standard-x11</option>
- <option value="xfce">xfce</option>
- <option value="xfce-junior">xfce-junior</option>
+ <select name="binary_image" size="1">
+ <option value="hdd">hdd</option>
+ <option value="iso" SELECTED>iso</option>
+ <option value="hdd">usb</option>
+ <option value="hdd">net</option>
</select>
</td>
</tr>
<tr>
<td> --distribution: </td>
<td>
- <select name="www_distribution" size="1">
+ <select name="distribution" size="1">
<option value="etch" SELECTED>etch</option>
<option value="lenny">lenny</option>
<option value="sid">sid</option>
@@ -47,30 +34,43 @@
</td>
</tr>
<tr>
- <td> --binary-image: </td>
+ <td> --filesystem: </td>
<td>
- <select name="www_binary_image" size="1">
- <option value="hdd">hdd</option>
- <option value="iso" SELECTED>iso</option>
- <option value="hdd">usb</option>
- <option value="hdd">net</option>
+ <select name="filesystem" size="1">
+ <option value="ext2">ext2</option>
+ <option value="plain">plain</option>
+ <option value="squashfs" SELECTED>squashfs</option>
</select>
</td>
</tr>
<tr>
- <td> --filesystem: </td>
+ <td> --packages-lists: </td>
<td>
- <select name="www_filesystem" size="1">
- <option value="ext2">ext2</option>
- <option value="plain">plain</option>
- <option value="squashfs" SELECTED>squashfs</option>
+ <select name="packages_lists" size="1" >
+ <option value="gnome" SELECTED>gnome</option>
+ <option value="gnome-core">gnome-core</option>
+ <option value="gnome-full">gnome-full</option>
+ <option value="gnome-junior">gnome-junior</option>
+ <option value="gnustep">gnustep</option>
+ <option value="kde">kde</option>
+ <option value="kde-core">kde-core</option>
+ <option value="kde-extra">kde-extra</option>
+ <option value="kde-full">kde-full</option>
+ <option value="kde-junior">kde-junior</option>
+ <option value="mini">mini</option>
+ <option value="minimal">minimal</option>
+ <option value="rescue">rescue</option>
+ <option value="standard">standard</option>
+ <option value="standard-x11">standard-x11</option>
+ <option value="xfce">xfce</option>
+ <option value="xfce-junior">xfce-junior</option>
</select>
</td>
</tr>
<tr>
<td> --packages: </td>
<td>
- <input name="www_packages" size="100" />
+ <input name="packages" size="100" />
</td>
</tr>
</table>
Modified: dists/trunk/live-webbuilder/live-webbuilder.sh
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder.sh 2007-05-04 14:39:57 UTC (rev 1237)
+++ dists/trunk/live-webbuilder/live-webbuilder.sh 2007-05-04 14:47:27 UTC (rev 1238)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
##########################################
# 20070503 Nelson
@@ -28,7 +28,7 @@
##########################################
#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 +43,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
- WWW_REPLY_TO_EMAIL=`echo "$QUERY_STRING" | grep -oE "(^|[?&])www_reply_to_email=[0-9,a-z,A-Z,.,%,-]+" | sed "s/%40/@/g" | cut -f 2 -d "=" | head -n1`
- WWW_PACKAGES_LISTS=`echo "$QUERY_STRING" | grep -oE "(^|[?&])www_packages_lists=[a-z]+" | cut -f 2 -d "=" | head -n1`
- WWW_BINARY_IMAGE=`echo "$QUERY_STRING" | grep -oE "(^|[?&])www_binary_image=[a-z]+" | cut -f 2 -d "=" | head -n1`
- WWW_DISTRIBUTION=`echo "$QUERY_STRING" | grep -oE "(^|[?&])www_distribution=[a-z]+" | cut -f 2 -d "=" | head -n1`
- WWW_PACKAGES=`echo "$QUERY_STRING" | grep -oE "(^|[?&])www_packages=[[0-9,a-z,A-Z,.,_,-]+" | sed "s/+/ /g" | cut -f 2 -d "="`
- WWW_FILESYSTEM=`echo "$QUERY_STRING" | grep -oE "(^|[?&])www_filesystem=[0-9,a-z]+" | 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=`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
@@ -69,7 +69,7 @@
##########################################
echo `whoami`
echo "WWW_LIVE_PARAMETERS=\"${WWW_MAKE_LIVE_PARAMETERS}\"" > /tmp/${WWW_BUILD_ID}.wdl
- echo "WWW_REPLY_TO_EMAIL=\"${WWW_REPLY_TO_EMAIL}\"" >> /tmp/${WWW_BUILD_ID}.wdl
+ echo "EMAIL=\"${EMAIL}\"" >> /tmp/${WWW_BUILD_ID}.wdl
- #{ make-live -r ${WWW_WOKR_PATH}${WWW_BUILD_ID} --mirror-build ${WWW_MIRROR_BUILD} --packages-lists ${WWW_PACKAGES_LISTS} --binary-image ${WWW_BINARY_IMAGE} --distibution ${WWW_DISTRIBUTION} --filesystem ${WWW_FILESYSTEM} --packages "${WWW_PACKAGES}"; echo "Returned $? at $(date)"; } 2>&1 | mail -s "Your debian-live build with id - ${WWW_BUILD_ID}" ${WWW_REPLY_TO_EMAIL}
+ #{ make-live -r ${WWW_WOKR_PATH}${WWW_BUILD_ID} --mirror-build ${WWW_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 - ${WWW_BUILD_ID}" ${EMAIL}
fi
More information about the Debian-live-changes
mailing list