[Debian-live-changes] r1095 - dists/trunk/live-helper/debian

[Daniel Baumann]

Author: daniel
Date: 2007-04-18 16:17:34 +0000 (Wed, 18 Apr 2007)
New Revision: 1095

Modified:
   dists/trunk/live-helper/debian/cron.daily
Log:


Modified: dists/trunk/live-helper/debian/cron.daily
===================================================================
--- dists/trunk/live-helper/debian/cron.daily	2007-04-18 14:59:15 UTC (rev 1094)
+++ dists/trunk/live-helper/debian/cron.daily	2007-04-18 16:17:34 UTC (rev 1095)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -x
 
 set -e
 
@@ -28,15 +28,13 @@
 # Check for build directory
 if [ ! -d "${AUTOBUILD_TEMPDIR}" ]
 then
-	mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+	mkdir -p "${AUTOBUILD_TEMPDIR}"
 else
 	# FIXME: maybe we should just remove the left overs.
 	echo "E: ${AUTOBUILD_TEMPDIR} needs cleanup."
 	exit 1
 fi
 
-cd "${AUTOBUILD_TEMPDIR}"
-
 for ARCHITECTURE in ${AUTOBUILD_ARCHITECTURES}
 do
 	for DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS}
@@ -46,6 +44,8 @@
 			if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt ]
 		then
 			# Generating images
+			mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+			cd "${AUTOBUILD_TEMPDIR}"
 			make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source enabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
 		fi
 
@@ -75,7 +75,9 @@
 			touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_rootfs
 
 			# Generating images
-			make-live -b usb > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+			mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+			cd "${AUTOBUILD_TEMPDIR}"
+			make-live -b usb -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
 		fi
 
 		if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ]
@@ -91,7 +93,8 @@
 		fi
 
 		# Cleanup
-		rm -rf "${AUTOBUILD_TEMPDIR}"/debian-live
+		cd "${AUTOBUILD_TEMPDIR}"/debian-live
+		lh_clean
 		done
 	done
 done