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

Daniel Baumann daniel at alioth.debian.org
Fri May 4 14:10:51 UTC 2007


Author: daniel
Date: 2007-05-04 14:10:50 +0000 (Fri, 04 May 2007)
New Revision: 1228

Added:
   dists/trunk/live-webbuilder/htmlblock
   dists/trunk/live-webbuilder/htmlbuild
   dists/trunk/live-webbuilder/htmlheader
Modified:
   dists/trunk/live-webbuilder/live-webbuilder.sh
Log:


Added: dists/trunk/live-webbuilder/htmlblock
===================================================================
--- dists/trunk/live-webbuilder/htmlblock	2007-05-04 13:47:57 UTC (rev 1227)
+++ dists/trunk/live-webbuilder/htmlblock	2007-05-04 14:10:50 UTC (rev 1228)
@@ -0,0 +1,51 @@
+<BR><H2>Please submit your parameters (email is required) to generate you live cd. </H2>
+<BR><BR>
+<FORM method=get action=/cgi-bin/live-webbuilder.sh>
+<TABLE>
+<TR><TD>* Email Address: </TD><TD> <INPUT SIZE=40 NAME=www_reply_to_email></TD></TR>
+<TR><TD> --packages-lists: </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></TD></TR>
+<TR><TD> --distribution: </TD><TD>
+<select name="www_distribution" size="1">
+<option value="etch" SELECTED>etch</option>
+<option value="lenny">lenny</option>
+<option value="sid">sid</option>
+</select></TD></TR>
+<TR><TD> --binary-image: </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></TD></TR>
+<TR><TD> --filesystem: </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></TD></TR>
+<TR><TD> --packages: </TD><TD> <INPUT SIZE=150 NAME=www_packages></TD></TR>
+</TABLE>
+<BR>
+<INPUT type=submit value="Submit">
+</FORM>
+</BODY>
+</HTML>

Added: dists/trunk/live-webbuilder/htmlbuild
===================================================================
--- dists/trunk/live-webbuilder/htmlbuild	2007-05-04 13:47:57 UTC (rev 1227)
+++ dists/trunk/live-webbuilder/htmlbuild	2007-05-04 14:10:50 UTC (rev 1228)
@@ -0,0 +1,11 @@
+<BR><H2>Your build id is ${WWW_BUILD_ID}. We shall begin the build attempt shortly. You will be notified when the attempt has completed.</H2>
+The parameters you submitted are:
+<BR>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}
+<BR><H2>Thank you for your submission. </H2>
+</BODY>
+</HTML>

Added: dists/trunk/live-webbuilder/htmlheader
===================================================================
--- dists/trunk/live-webbuilder/htmlheader	2007-05-04 13:47:57 UTC (rev 1227)
+++ dists/trunk/live-webbuilder/htmlheader	2007-05-04 14:10:50 UTC (rev 1228)
@@ -0,0 +1,22 @@
+<html>
+	<head>
+		<title>WWW Debian Live Version ${VERSION_NUMBER}</title>
+
+		<link rel="icon" href="http://debian-live.alioth.debian.org/favicon.ico" type="image/ico">
+		<link rel="stylesheet" type="text/css" href="http://debian-live.alioth.debian.org/images/style.css" />
+		<meta http-equiv="content-type" content="text/html; charset=iso-8859-15">
+		<meta name="keywords" content="Debian, Live, Project">
+
+		<meta name="description" content="The Debian Live Project">
+	</head>
+<body>
+<div id="header">
+	<div id="debianlogo"><img src="http://debian-live.alioth.debian.org/images/debian.png" alt="Debian logo" width="56" height="70"></div>
+
+	<div id="headertitle"><a href="http://debian-live.alioth.debian.org/" title="http://debian-live.alioth.debian.org/">Debian Live</a></div>
+	<div id="headersubtitle">Live Debian systems!</div>
+</div>
+
+<div id="maincontent" style="margin: 0 0 0 0;">
+<h1>This is the live-webbuild interface version ${VERSION_NUMBER} for the <a href="http://debian-live.alioth.debian.org/">Debian Live</a> project.</h1>
+</div>

Modified: dists/trunk/live-webbuilder/live-webbuilder.sh
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder.sh	2007-05-04 13:47:57 UTC (rev 1227)
+++ dists/trunk/live-webbuilder/live-webbuilder.sh	2007-05-04 14:10:50 UTC (rev 1228)
@@ -10,119 +10,33 @@
 # - Set version to 0.2
 # - Get initial layout of idea.
 
-##########################################
 # Set some global the parameters
-##########################################
 VERSION_NUMBER="0.2.3"
 WWW_WORK_PATH="/tmp/"
 WWW_MIRROR_BUILD="http://localhost/debian"
 
-##########################################
 # Send the HTTP headers
-##########################################
 echo "Content-type: text/html"
 echo ""
 
-##########################################
 # Start sending HTML
-##########################################
-cat << HTMLHEADER
-<html>
-	<head>
-		<title>WWW Debian Live Version ${VERSION_NUMBER}</title>
+cat htmlheader
 
-		<link rel="icon" href="http://debian-live.alioth.debian.org/favicon.ico" type="image/ico">
-		<link rel="stylesheet" type="text/css" href="http://debian-live.alioth.debian.org/images/style.css" />
-		<meta http-equiv="content-type" content="text/html; charset=iso-8859-15">
-		<meta name="keywords" content="Debian, Live, Project">
-
-		<meta name="description" content="The Debian Live Project">
-	</head>
-<body>
-<div id="header">
-	<div id="debianlogo"><img src="http://debian-live.alioth.debian.org/images/debian.png" alt="Debian logo" width="56" height="70"></div>
-
-	<div id="headertitle"><a href="http://debian-live.alioth.debian.org/" title="http://debian-live.alioth.debian.org/">Debian Live</a></div>
-	<div id="headersubtitle">Live Debian systems!</div>
-</div>
-
-<div id="maincontent" style="margin: 0 0 0 0;">
-<h1>This is the live-webbuild interface version ${VERSION_NUMBER} for the <a href="http://debian-live.alioth.debian.org/">Debian Live</a> project.</h1>
-</div>
-HTMLHEADER
-
 ##########################################
 # Collet the parms
 ##########################################
 #echo $QUERY_STRING
 
 if [ -z "$QUERY_STRING" ]; then
-	##########################################
 	# Generate the form since it looks like
 	# no parameters were detected being passed.
-	##########################################
-	cat << HTMLBLOCK
-<BR><H2>Please submit your parameters (email is required) to generate you live cd. </H2>
-<BR><BR>
-<FORM method=get action=/cgi-bin/live-webbuilder.sh>
-<TABLE>
-<TR><TD>* Email Address: </TD><TD> <INPUT SIZE=40 NAME=www_reply_to_email></TD></TR>
-<TR><TD> --packages-lists: </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></TD></TR>
-<TR><TD> --distribution: </TD><TD>
-<select name="www_distribution" size="1">
-<option value="etch" SELECTED>etch</option>
-<option value="lenny">lenny</option>
-<option value="sid">sid</option>
-</select></TD></TR>
-<TR><TD> --binary-image: </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></TD></TR>
-<TR><TD> --filesystem: </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></TD></TR>
-<TR><TD> --packages: </TD><TD> <INPUT SIZE=150 NAME=www_packages></TD></TR>
-</TABLE>
-<BR>
-<INPUT type=submit value="Submit">
-</FORM>
-</BODY>
-</HTML>
-HTMLBLOCK
-
+	cat htmlblock
 else
-	##########################################
 	# Ok we made it here so we have parameters
 	# sent to the script.
-	##########################################
-	##########################################
-	# Collet parameters from the $QUERY_STRING
-	##########################################
+
+	# Collect parameters from the $QUERY_STRING
+
 	#echo $QUERY_STRING
 	# sed "s/+/ /g" -> converts for spaces passed
 	# sed "s/%40/@/g" -> converts for @ symbol passed
@@ -146,19 +60,7 @@
 	##########################################
 	# Start sending HTML
 	##########################################
-	cat << HTMLBLOCK
-<BR><H2>Your build id is ${WWW_BUILD_ID}. We shall begin the build attempt shortly. You will be notified when the attempt has completed.</H2>
-The parameters you submitted are:
-<BR>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}
-<BR><H2>Thank you for your submission. </H2>
-</BODY>
-</HTML>
-HTMLBLOCK
+	cat htmlbuild
 
 	##########################################
 	# Set the variables to pass to the cron job




More information about the Debian-live-changes mailing list