X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=scripts%2Fpack-image.sh;h=67f2054a68d686259c66ea492bde4762794aee83;hb=f43bf03174407b5fe6e9fb85d23480613fa3e1e4;hp=2bdb75e920134b46ee49e9d8ca9756eae10d93c6;hpb=0bba787e9c63f1c526997ca5c3f85df0efbd38ed;p=backups%2F.git

diff --git a/scripts/pack-image.sh b/scripts/pack-image.sh
index 2bdb75e..67f2054 100755
--- a/scripts/pack-image.sh
+++ b/scripts/pack-image.sh
@@ -22,6 +22,11 @@ isoimage="$imagedir/$today.iso"
 isomountdir="$isoimage.mnt"
 restorescript="$scriptsdir/restore.sh"
 
+echo "-> Checking for available disk space on $imagedir"
+available=$(df $imagedir | awk '{print$4}' | grep -E "[0-9]+")
+required=$((imagesizemb*1024))
+[ $required -gt $available ] && err "Not enough space for the backup image on $imagedir"
+
 echo "-> Creating directories"
 mkdir --mode=700 -p $datadir $imagedir $isomountdir $tmpdir
 if [ $? != 0 ]; then
@@ -61,7 +66,7 @@ echo "excludedirs: $excludedirs"
 echo "-> Running find to get the status of files"
 {
   for type in d f l; do
-    findformat="$type %#m %u %g %s %CY%Cm%Cd%CH%CM%CS 0 %p\0"
+    findformat="$type %#m %u %g %s %TY%Tm%Td%TH%TM%TS 0 %p\0"
     if [ -z "$excludedirs" ]; then
       find $backupdirs -type $type -printf "$findformat"
     else
@@ -71,7 +76,7 @@ echo "-> Running find to get the status of files"
   done
 } > $currentfiles
 
-if [ -n $simulate ]; then
+if [ -n "$simulate" ]; then
   backupdbin=$backupdbout
 fi
 
@@ -82,7 +87,7 @@ echo "-> Determining list of files to backup with lsbackups"
   cat $currentfiles
 } | lsbackups > $backups 2>$statusfile
 
-if [ -n $simulate ]; then
+if [ -n "$simulate" ]; then
    umount $isomountdir
    rm -rf $isomountdir $isoimage
    cat $statusfile
@@ -115,6 +120,8 @@ echo "-> Calculating md5sum for image"
 md5sum $isoimage | awk '{print$1}' > $isoimage.md5sum
 
 [ $? != 0 ] && err "Unable to calculate the md5sum for this image: $isoimage"
+[ -z "$isoimage.md5sum" ] && err "Unable to calculate the md5sum for this image: $isoimage"
+[ -s "$isoimage.md5sum" ] || err "Unable to calculate the md5sum for this image: $isoimage"
 
 cat $statusfile | mailx -s "DVD image available to burn - $today" $mailto