r2831 - in dists/trunk/live-webhelper: scripts templates/debian-official templates/debian-unofficial

[rjent-guest at alioth.debian.org]

Author: rjent-guest
Date: 2007-09-04 03:05:37 +0000 (Tue, 04 Sep 2007)
New Revision: 2831

Modified:
   dists/trunk/live-webhelper/scripts/cron
   dists/trunk/live-webhelper/templates/debian-official/form.html
   dists/trunk/live-webhelper/templates/debian-unofficial/form.html
Log:
cron and template cleanup/fix with current svn

Modified: dists/trunk/live-webhelper/scripts/cron
===================================================================
--- dists/trunk/live-webhelper/scripts/cron	2007-09-03 18:47:59 UTC (rev 2830)
+++ dists/trunk/live-webhelper/scripts/cron	2007-09-04 03:05:37 UTC (rev 2831)
@@ -58,17 +58,17 @@
 		echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: begin web build (${BUILD})." >> /var/log/live
 
 		# Creating build directory which also creates the config/chroot_sources folder
-		mkdir -p "${TEMPDIR}"/"${BUILD}"/debian-live/config/chroot_sources
+		mkdir -p "${TEMPDIR}"/"${BUILD}"/config/chroot_sources
 
 		# The next two tests are for unofficial third party repositories
 		if [ -n "${CUSTOM_BOOTSTRAP}" ]
 		then
-			echo "${CUSTOM_BOOTSTRAP}" > "${TEMPDIR}"/"${BUILD}"/debian-live/config/chroot_sources/custom.bootstrap
+			echo "${CUSTOM_BOOTSTRAP}" > "${TEMPDIR}"/"${BUILD}"/config/chroot_sources/custom.bootstrap
 		fi
 
 		if [ -n "${CUSTOM_BINARY}" ]
 		then
-			echo "${CUSTOM_BINARY}" > "${TEMPDIR}"/"${BUILD}"/debian-live/config/chroot_sources/custom.binary
+			echo "${CUSTOM_BINARY}" > "${TEMPDIR}"/"${BUILD}"/config/chroot_sources/custom.binary
 		fi
 
 		DATE_START="`date -R`"
@@ -76,7 +76,7 @@
 
 		# Generating image
 		cd "${TEMPDIR}"/"${BUILD}"
-		lh_config --config ${FILE} >> "${TEMPDIR}"/"${BUILD}"/log 2>&1
+		lh_config -c ${FILE} >> "${TEMPDIR}"/"${BUILD}"/log 2>&1
 		ERRORCONFIG="${?}"
 		lh_build >> "${TEMPDIR}"/"${BUILD}"/log 2>&1
 		ERRORBUILD="${?}"
@@ -105,15 +105,15 @@
 		"${TEMPLATES}"/mail.txt > "${DESTDIR}"/"${BUILD}"/mail
 
 		# Moving binary image
-		if ls "${TEMPDIR}"/"${BUILD}"/debian-live/binary.* > /dev/null 2>&1
+		if ls "${TEMPDIR}"/"${BUILD}"/binary.* > /dev/null 2>&1
 		then
-			mv "${TEMPDIR}"/"${BUILD}"/debian-live/binary.* "${DESTDIR}"/"${BUILD}"
+			mv "${TEMPDIR}"/"${BUILD}"/binary.* "${DESTDIR}"/"${BUILD}"
 		fi
 
 		# Moving source image
-		if ls "${TEMPDIR}"/"${BUILD}"/debian-live/source.* > /dev/null 2>&1
+		if ls "${TEMPDIR}"/"${BUILD}"/source.* > /dev/null 2>&1
 		then
-			mv "${TEMPDIR}"/"${BUILD}"/debian-live/source.* "${DESTDIR}"/"${BUILD}"
+			mv "${TEMPDIR}"/"${BUILD}"/source.* "${DESTDIR}"/"${BUILD}"
 		fi
 
 		# Moving build
@@ -131,15 +131,15 @@
 		cat "${DESTDIR}"/"${BUILD}"/mail | /usr/sbin/sendmail -t
 
 		# Unmounting proc
-		if [ -f "${TEMPDIR}"/"${BUILD}"/debian-live/chroot/proc/version ]
+		if [ -f "${TEMPDIR}"/"${BUILD}"/chroot/proc/version ]
 		then
-			umount "${TEMPDIR}"/"${BUILD}"/debian-live/chroot/proc
+			umount "${TEMPDIR}"/"${BUILD}"/chroot/proc
 		fi
 
 		# Unmounting sysfs
-		if [ -d "${TEMPDIR}"/"${BUILD}"/debian-live/chroot/sys/kernel ]
+		if [ -d "${TEMPDIR}"/"${BUILD}"/chroot/sys/kernel ]
 		then
-			umount "${TEMPDIR}"/${BUILD}/debian-live/chroot/sys
+			umount "${TEMPDIR}"/${BUILD}/chroot/sys
 		fi
 
 		# Removing build directory

Modified: dists/trunk/live-webhelper/templates/debian-official/form.html
===================================================================
--- dists/trunk/live-webhelper/templates/debian-official/form.html	2007-09-03 18:47:59 UTC (rev 2830)
+++ dists/trunk/live-webhelper/templates/debian-official/form.html	2007-09-04 03:05:37 UTC (rev 2831)
@@ -242,7 +242,7 @@
 			<td><label for="Encryption">--encryption:</label> </td>
 			<td>
 				<select id="Encryption" name="encryption" size="1">
-					<option selected value="none">none</option>
+					<option selected value="">none</option>
 					<option value="AES128">AES128</option>
 					<option value="AES192">AES192</option>
 					<option value="AES256">AES256</option>

Modified: dists/trunk/live-webhelper/templates/debian-unofficial/form.html
===================================================================
--- dists/trunk/live-webhelper/templates/debian-unofficial/form.html	2007-09-03 18:47:59 UTC (rev 2830)
+++ dists/trunk/live-webhelper/templates/debian-unofficial/form.html	2007-09-04 03:05:37 UTC (rev 2831)
@@ -242,7 +242,7 @@
 			<td><label for="Encryption">--encryption:</label> </td>
 			<td>
 				<select id="Encryption" name="encryption" size="1">
-					<option selected value="none">none</option>
+					<option selected value="">none</option>
 					<option value="AES128">AES128</option>
 					<option value="AES192">AES192</option>
 					<option value="AES256">AES256</option>