[SCM] Debian Live build scripts (webfrontent) branch, master, updated. 7742576d3a9b84807c6456007ad3bc0147ca3024

[Richard Nelson]

The following commit has been merged in the master branch:
commit 6817dca69fd0c53578c1e14c9c5333d5be94419d
Author: Richard Nelson <unixabg at gmail.com>
Date:   Thu Nov 27 22:42:58 2008 -0600

    Update to start using more live-helper functions.

diff --git a/scripts/cron b/scripts/cron
index e655285..58b0d7e 100755
--- a/scripts/cron
+++ b/scripts/cron
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -x
 
 # live-webhelper - web interface to live-helper
 # Copyright (C) 2007-2008 Richard Nelson <unixabg at gmail.com>
@@ -56,7 +56,8 @@ then
 fi
 
 # Ok from here spin through the live-webhelper files we have waiting to build
-if ls "${_TEMPDIR}"/*.build > /dev/null 2>&1
+#if ls "${_TEMPDIR}"/*.build > /dev/null 2>&1
+if Find_files ${_TEMPDIR}/*.build 
 then
 	for _FILE in "${_TEMPDIR}"/*.build
 	do
@@ -121,15 +122,15 @@ then
 		"${_TEMPLATES}"/mail.txt > "${_DESTDIR}"/"${_BUILD}"/mail
 
 		# Moving binary image
-		if ls "${_TEMPDIR}"/"${_BUILD}"/binary*.* > /dev/null 2>&1
-		#if Find_files "${_TEMPDIR}/${_BUILD}/binary.*"
+		#if ls "${_TEMPDIR}"/"${_BUILD}"/binary*.* > /dev/null 2>&1
+		if Find_files ${_TEMPDIR}/${_BUILD}/binary*.*
 		then
 			mv "${_TEMPDIR}"/"${_BUILD}"/binary*.* "${_DESTDIR}"/"${_BUILD}"
 		fi
 
 		# Moving source image
-		if ls "${_TEMPDIR}"/"${_BUILD}"/source.* > /dev/null 2>&1
-		#if Find_files "${_TEMPDIR}/${_BUILD}/source.*"
+		#if ls "${_TEMPDIR}"/"${_BUILD}"/source.* > /dev/null 2>&1
+		if Find_files ${_TEMPDIR}/${_BUILD}/source.*
 		then
 			mv "${_TEMPDIR}"/"${_BUILD}"/source.* "${_DESTDIR}"/"${_BUILD}"
 		fi
@@ -149,8 +150,8 @@ then
 		cat "${_DESTDIR}"/"${_BUILD}"/mail | /usr/sbin/sendmail -t
 
 		# Unmounting devpts-live
-		if ls "${_TEMPDIR}"/"${_BUILD}"/chroot/dev/pts/* > /dev/null 2>&1
-		#if Find_files "${_TEMPDIR}/${_BUILD}/chroot/dev/pts/*"
+		#if ls "${_TEMPDIR}"/"${_BUILD}"/chroot/dev/pts/* > /dev/null 2>&1
+		if Find_files ${_TEMPDIR}/${_BUILD}/chroot/dev/pts/*
 		then
 			umount "${_TEMPDIR}"/${_BUILD}/chroot/dev/pts
 		fi

-- 
Debian Live build scripts (webfrontent)