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

[Daniel Baumann]

Author: daniel
Date: 2007-05-07 19:30:23 +0000 (Mon, 07 May 2007)
New Revision: 1372

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


Modified: dists/trunk/live-webbuilder/Makefile
===================================================================
--- dists/trunk/live-webbuilder/Makefile	2007-05-07 19:21:17 UTC (rev 1371)
+++ dists/trunk/live-webbuilder/Makefile	2007-05-07 19:30:23 UTC (rev 1372)
@@ -7,6 +7,7 @@
 
 install: test
 	# Installing executables
+	install -D -m 0755 cron-webbuilder $(DESTDIR)/etc/cron.d/live-webbuilder
 	install -D -m 0755 live-webbuilder $(DESTDIR)/usr/lib/cgi-bin/live-webbuilder
 
 	# Installing templates
@@ -15,6 +16,7 @@
 
 uninstall:
 	# Uninstalling executables
+	rm -f $(DESTDIR)/etc/cron.d/live-webbuilder
 	rm -f $(DESTDIR)/usr/lib/cgi-bin/live-webbuilder
 
 	# Uninstalling shared data

Copied: dists/trunk/live-webbuilder/cron-webbuilder (from rev 1369, dists/trunk/live-webbuilder/webbuilder-cron)

Deleted: dists/trunk/live-webbuilder/webbuilder-cron
===================================================================
--- dists/trunk/live-webbuilder/webbuilder-cron	2007-05-07 19:21:17 UTC (rev 1371)
+++ dists/trunk/live-webbuilder/webbuilder-cron	2007-05-07 19:30:23 UTC (rev 1372)
@@ -1,81 +0,0 @@
-#!/bin/sh -x
-
-# webbuilder-cron - cron for live-webbuilder a web-interface to make-live
-# Copyright (C) 2007 Richard Nelson <rjent at rjent.pair.com>
-#
-# live-webbuilder comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Set some global parameters
-DESTDIR="/var/www/live-webbuilder"
-MIRROR="http://localhost/debian/"
-MIRROR_IMAGE="http://localhost/debian/"
-MIRROR_SECURITY="http://ftp.us.debian.org/debian-security/"
-SITE_SERVER="http://localhost/live-webbuilder"
-TEMPDIR="/tmp"
-VERSION="0.1.0"
-MAILER=""
-
-# Check for webbuilder-cron.sh already running
-if [ ! -f "${TEMPDIR}"/lwb-lock ]
-then
-	touch "${TEMPDIR}"/lwb-lock
-else
-	echo "E: webbuilder-cron.sh already running according to lock file."
-	exit 1
-fi
-
-# The LWB_LIST is the listing of live-webbuilder files waiting
-LWB_LIST="`ls "${TEMPDIR}"/*.lwb`"
-
-# Ok from here spin through the live-webbuilder files we have waiting to build
-for LWB in ${LWB_LIST}
-do
-	if [ -f "${LWB}" ]
-	then
-		# Pull in the meta file
-		. "${LWB}"
-		# Below are the current values that are expected to be their.
-		#echo ${BUILD_ID}
-		#echo ${EMAIL}
-		#echo ${BINARY_IMAGE}
-		#echo ${DISTRIBUTION}
-		#echo ${FILESYSTEM}
-		#echo ${PACKAGES_LISTS}
-		#echo ${PACKAGES}
-		mkdir -p "${DESTDIR}"/${BUILD_ID}
-		cd "${DESTDIR}"/${BUILD_ID}
-		MAILER="Greetings,\nBeginning you build at: `date -R`"
-		echo "Begin: `date -R`"  > "${DESTDIR}"/${BUILD_ID}/log.txt
-		# Below is where we try to put is all together.
-		make-live --root "${DESTDIR}"/${BUILD_ID} --mirror-build ${MIRROR} --mirror-image ${MIRROR_IMAGE} --packages-lists ${PACKAGES_LISTS} --binary-image ${BINARY_IMAGE} --distribution ${DISTRIBUTION} --filesystem ${FILESYSTEM} --packages "${PACKAGES}" >> "${DESTDIR}"/${BUILD_ID}/log.txt 2>&1
-		MAILER="${MAILER}\nEnding your build at: `date -R`\nTo download your debian-live build see ${SITE_SERVER}/${BUILD_ID} "
-		echo "Ending: `date -R`"  >> "${DESTDIR}"/${BUILD_ID}/log.txt
-		echo  ${MAILER} | mail -s "End build od id - ${BUILD_ID}" ${EMAIL}
-
-		# Move the .lwb file to the target so we do not try to rebuild later
-		mv "${LWB}" "${DESTDIR}"/${BUILD_ID}
-
-		# Do cleanup after
-		#cd "${DESTDIR}"/${BUILD_ID}
-		#lh_clean
-
-		# Unmount some things if still around
-		if [ -e "${DESTDIR}"/${BUILD_ID}/chroot/proc/version ]
-		then
-			umount "${DESTDIR}"/${BUILD_ID}/chroot/proc
-		fi
-
-		if [ -d "${DESTDIR}"/${BUILD_ID}/chroot/sys/kernel ]
-		then
-			umount "${DESTDIR}"/${BUILD_ID}/chroot/sys
-		fi
-
-	fi
-done
-
-# Remove the lock file if we get here.
-rm "${TEMPDIR}"/lwb-lock