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

[Daniel Baumann]

Author: daniel
Date: 2007-05-04 16:26:20 +0000 (Fri, 04 May 2007)
New Revision: 1249

Added:
   dists/trunk/live-webbuilder/live-webbuilder
Removed:
   dists/trunk/live-webbuilder/live-webbuilder.sh
Modified:
   dists/trunk/live-webbuilder/Makefile
Log:


Modified: dists/trunk/live-webbuilder/Makefile
===================================================================
--- dists/trunk/live-webbuilder/Makefile	2007-05-04 15:52:14 UTC (rev 1248)
+++ dists/trunk/live-webbuilder/Makefile	2007-05-04 16:26:20 UTC (rev 1249)
@@ -3,14 +3,11 @@
 all: install
 
 test:
-	set -e; for SCRIPT in *.sh; \
-	do \
-		sh -n $$SCRIPT; \
-	done
+	sh -n live-webbuilder || exit 1
 
 install: test
 	# Installing executables
-	install -D -m 0755 live-webbuilder.sh $(DESTDIR)/usr/lib/cgi-bin/live-webbuilder
+	install -D -m 0755 live-webbuilder $(DESTDIR)/usr/lib/cgi-bin/live-webbuilder
 
 	# Installing templates
 	mkdir -p $(DESTDIR)/usr/share/live-webbuilder/html

Copied: dists/trunk/live-webbuilder/live-webbuilder (from rev 1248, dists/trunk/live-webbuilder/live-webbuilder.sh)

Deleted: dists/trunk/live-webbuilder/live-webbuilder.sh
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder.sh	2007-05-04 15:52:14 UTC (rev 1248)
+++ dists/trunk/live-webbuilder/live-webbuilder.sh	2007-05-04 16:26:20 UTC (rev 1249)
@@ -1,78 +0,0 @@
-#!/bin/sh
-
-##########################################
-# 20070503 Nelson
-# - Set version to 0.2.3
-# - Cleanup the expressions to work correct.
-# - Added some base values.
-# - Changed name to live-webbuilder to match svn granted by panthera.
-# 20070502 Nelson
-# - Set version to 0.2
-# - Get initial layout of idea.
-
-# Set some global the parameters
-VERSION="0.2.3"
-WWW_WORK_PATH="/tmp/"
-WWW_MIRROR_BUILD="http://localhost/debian"
-HTML="/usr/share/live-webbuilder/html"
-
-# Send the HTTP headers
-echo "Content-type: text/html"
-echo
-
-# Start sending HTML
-cat "${HTML}"/header.html
-
-##########################################
-# 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 "${HTML}"/form.html
-else
-	# Ok we made it here so we have parameters
-	# sent to the script.
-
-	# Collect parameters from the $QUERY_STRING
-
-	#echo $QUERY_STRING
-	# sed "s/+/ /g" -> converts for spaces passed
-	# sed "s/%40/@/g" -> converts for @ symbol passed
-	# sed "s/%3A/:/g" -> converts for : sybmol passed
-	# sed "s/%2F/\//g" -> converts for / symbol passed
-	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
-	# This is crude but should get the average
-	# site by until someone else wanted to mess
-	# with.
-	##########################################
-	WWW_BUILD_ID="`date +%Y%m%d%H%M%S`"
-
-	##########################################
-	# Start sending HTML
-	##########################################
-	cat "${HTML}"/build.html
-
-	##########################################
-	# Set the variables to pass to the cron job
-	# for processing.
-	##########################################
-	echo "`whoami`"
-	echo "WWW_LIVE_PARAMETERS=\"${WWW_MAKE_LIVE_PARAMETERS}\"" > /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 ${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
-
-cat "${HTML}"/footer.html