[Debian-live-changes] r1757 - in dists/trunk/live-webhelper: . templates
daniel at alioth.debian.org
daniel at alioth.debian.org
Fri May 25 21:51:58 UTC 2007
Author: daniel
Date: 2007-05-25 21:51:58 +0000 (Fri, 25 May 2007)
New Revision: 1757
Modified:
dists/trunk/live-webhelper/cron
dists/trunk/live-webhelper/live-webhelper
dists/trunk/live-webhelper/templates/form.html
Log:
Modified: dists/trunk/live-webhelper/cron
===================================================================
--- dists/trunk/live-webhelper/cron 2007-05-25 21:50:12 UTC (rev 1756)
+++ dists/trunk/live-webhelper/cron 2007-05-25 21:51:58 UTC (rev 1757)
@@ -54,7 +54,7 @@
echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: begin build ${BUILD}" >> /var/log/live
- # Assembling options
+ # Assembling standard options
if [ -n "${BINARY_IMAGE}" ]
then
LIVE_OPTIONS="${LIVE_OPTIONS} --binary-images ${BINARY_IMAGE}"
@@ -65,16 +65,44 @@
LIVE_OPTIONS="${LIVE_OPTIONS} --distribution ${DISTRIBUTION}"
fi
+ if [ -n "${PACKAGES}" ]
+ then
+ LIVE_OPTIONS="${LIVE_OPTIONS} --packages ${PACKAGES}"
+ fi
+
+ if [ -n "${PACKAGES_LISTS}" ]
+ then
+ LIVE_OPTIONS="${LIVE_OPTIONS} --packages-lists ${PACKAGES_LISTS}"
+ fi
+
+ # Assembling chroot options
if [ -n "${CHROOT_FILESYSTEM}" ]
then
LIVE_OPTIONS="${LIVE_OPTIONS} --chroot-filesystem ${CHROOT_FILESYSTEM}"
fi
+ # Assembling binary options
+ if [ -n "${ISO_APPLICATION}" ]
+ then
+ LIVE_OPTIONS="${LIVE_OPTIONS} --iso-application ${ISO_APPLICATION}"
+ fi
+
+ if [ -n "${ISO_PREPARER}" ]
+ then
+ LIVE_OPTIONS="${LIVE_OPTIONS} --iso-preparer ${ISO_PREPARER}"
+ fi
+
+ if [ -n "${ISO_PUBLISHER}" ]
+ then
+ LIVE_OPTIONS="${LIVE_OPTIONS} --iso-publisher ${ISO_PUBLISHER}"
+ fi
+
if [ -n "${ISO_VOLUME}" ]
then
LIVE_OPTIONS="${LIVE_OPTIONS} --iso-volume ${ISO_VOLUME}"
fi
+ # Assembling other options
if [ -n "${MIRROR_BOOTSTRAP}" ]
then
LIVE_OPTIONS="${LIVE_OPTIONS} --mirror-bootstrap ${MIRROR_BOOTSTRAP}"
@@ -95,16 +123,6 @@
LIVE_OPTIONS="${LIVE_OPTIONS} --mirror-binary-security ${MIRROR_BINARY_SECURITY}"
fi
- if [ -n "${PACKAGES}" ]
- then
- LIVE_OPTIONS="${LIVE_OPTIONS} --packages ${PACKAGES}"
- fi
-
- if [ -n "${PACKAGES_LISTS}" ]
- then
- LIVE_OPTIONS="${LIVE_OPTIONS} --packages-lists ${PACKAGES_LISTS}"
- fi
-
# Creating build directory
mkdir -p "${TEMPDIR}"/"${BUILD}"
Modified: dists/trunk/live-webhelper/live-webhelper
===================================================================
--- dists/trunk/live-webhelper/live-webhelper 2007-05-25 21:50:12 UTC (rev 1756)
+++ dists/trunk/live-webhelper/live-webhelper 2007-05-25 21:51:58 UTC (rev 1757)
@@ -57,6 +57,10 @@
PACKAGES="`echo ${QUERY_STRING} | grep -oE '(^|[?&])packages=[0-9,a-z,A-Z,.,_,-,+]+' | sed 's/+/ /g' | cut -f 2 -d '=' | head -n1`"
CHROOT_FILESYSTEM="`echo ${QUERY_STRING} | grep -oE '(^|[?&])chroot_filesystem=[0-9,a-z]+' | cut -f 2 -d '=' | head -n1`"
+
+ ISO_APPLICATION="`echo ${QUERY_STRING} | grep -oE '(^|[?&])iso_application=[0-9,a-z,A-Z,.,_,-,+]+' | sed 's/+/ /g' | cut -f 2 -d '=' | head -n1`"
+ ISO_PREPARER="`echo ${QUERY_STRING} | grep -oE '(^|[?&])iso_preparer=[0-9,a-z,A-Z,.,_,-,+]+' | sed 's/+/ /g' | cut -f 2 -d '=' | head -n1`"
+ ISO_PUBLISHER="`echo ${QUERY_STRING} | grep -oE '(^|[?&])iso_publisher=[0-9,a-z,A-Z,.,_,-,+]+' | sed 's/+/ /g' | 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
@@ -97,6 +101,10 @@
PACKAGES="${PACKAGES}"
CHROOT_FILESYSTEM="${CHROOT_FILESYSTEM}"
+
+ISO_APPLICATION="${ISO_APPLICATION}"
+ISO_PREPARER="${ISO_PREPARER}"
+ISO_PUBLISHER="${ISO_PUBLISHER}"
ISO_VOLUME="${ISO_VOLUME}"
EOF
Modified: dists/trunk/live-webhelper/templates/form.html
===================================================================
--- dists/trunk/live-webhelper/templates/form.html 2007-05-25 21:50:12 UTC (rev 1756)
+++ dists/trunk/live-webhelper/templates/form.html 2007-05-25 21:51:58 UTC (rev 1757)
@@ -24,7 +24,6 @@
</span>
<div id="text_1" style='margin-left:0;display:block'>
-
<table>
<tr>
<td><label for="Binary_image">--<u>b</u>inary-image:</label> </td>
@@ -81,13 +80,12 @@
</table>
</div>
-<span id="click_2" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(2,"<b>Advanced settings</b>")'>
- <b>Advanced settings</b><small> (click to expand)</small>
+<span id="click_2" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(2,"<b>Advanced chroot settings</b>")'>
+ <b>Advanced chroot settings</b><small> (click to expand)</small>
<br />
</span>
<div id="text_2" style='margin-left:0;display:none'>
-
<table>
<tr>
<td><label for="Chroot_Filesystem">--chroot-<u>f</u>ilesystem:</label> </td>
@@ -99,8 +97,30 @@
</select>
</td>
</tr>
+ </table>
+</div>
+
+<span id="click_3" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(3,"<b>Advanced binary settings</b>")'>
+ <b>Advanced binary settings</b><small> (click to expand)</small>
+ <br />
+</span>
+
+<div id="text_3" style='margin-left:0;display:none'>
+ <table>
<tr>
- <td><label for="Iso_Volume">--<u>i</u>so-volume:</label> </td>
+ <td><label for="Iso_Application">--iso-application:</label> </td>
+ <td><input accesskey="i" id="Iso_Application" name="iso_application" maxlength="200" size="50" type="text" /></td>
+ </tr>
+ <tr>
+ <td><label for="Iso_Preparer">--iso-preparer:</label> </td>
+ <td><input accesskey="i" id="Iso_Preparer" name="iso_preparer" maxlength="200" size="50" type="text" /></td>
+ </tr>
+ <tr>
+ <td><label for="Iso_Publisher">--iso-publisher:</label> </td>
+ <td><input accesskey="i" id="Iso_Publisher" name="iso_publisher" maxlength="200" size="50" type="text" /></td>
+ </tr>
+ <tr>
+ <td><label for="Iso_Volume">--iso-volume:</label> </td>
<td><input accesskey="i" id="Iso_Volume" name="iso_volume" maxlength="200" size="50" type="text" /></td>
</tr>
</table>
More information about the Debian-live-changes
mailing list