X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=scripts%2Fburn-imgs.sh;h=52296e8c4248c8975fc65a7fcdc485bbc6b32c7b;hb=f26370ff090f709dc762b166a6f56fdf4ea1ed60;hp=a3b6fb2e7de73d3560ba3ed7bcb7a48d340958a7;hpb=4c07511b60f32ff1205fe84071ee962ea656e59d;p=backups%2F.git

diff --git a/scripts/burn-imgs.sh b/scripts/burn-imgs.sh
index a3b6fb2..52296e8 100755
--- a/scripts/burn-imgs.sh
+++ b/scripts/burn-imgs.sh
@@ -5,13 +5,18 @@ PATH=$(dirname $0):/bin:/usr/bin
 . config.sh
 
 # If the noburn file is there then don't burn.
-[ -f "$burnlockfile" ] && exit 0
+[ -f "$noburnfile" ] && exit 0
+touch $noburnfile
 
 # Discover disk images by looking for .img.md5sum files in $imagedir
 imgmd5=$(ls $imagedir/*.img.md5sum | head -n 1)
 
+echo MD5 file: $imgmd5
+
 logfile=$(tempfile)
 
+echo Logfile: $logfile
+
 # If we didn't find an non-empty file then exit gracefully
 [ -z "$imgmd5" ] && exit 0
 [ -s "$imgmd5" ] || exit 0
@@ -19,24 +24,27 @@ logfile=$(tempfile)
 # Get the name of the disk image by stripping off the tailing '.md5sum'
 img=${imgmd5%.md5sum}
 
+echo Image: $img
+
 # A little paranoia.  Make sure the disk image file is there.
 [ -z "$img" ] && exit 1
 [ -s "$img" ] || exit 1
 
 # Burn the image to a disk.
-cdrecord-wrapper.sh -dao dev=$sdev $isoimage > $logfile 2>&1
+cdrecord-wrapper.sh -dao dev=$sdev $img > $logfile 2>&1
 
-if [ 0 != "$?" ]; then
+if [ "0" != "$?" ]; then
   echo >&2 "cdrecord failed!"
   exit 1
 fi
 
 # Now verify the disk by running md5sum on the entire contents of the disk
 md5sum=$(tempfile)
+echo Md5sum: $md5sum
 dd if=$dev bs=1M count=4440 2>$logfile | md5sum | awk '{print$1}' > $md5sum
 
 # Check that the md5sums match
-if ! cmp $md5sum $isoimage.md5sum; then
+if ! cmp $md5sum $img.md5sum; then
   echo "Failed" | mailx -s "DVD md5sum doesn't match image file!!!" $mailto
   exit 1
 fi
@@ -44,8 +52,6 @@ fi
 # Record the date in the stat file to indicate that this burn was a success
 date >> $img.stat
 
-touch $burnlockfile
-
 { # Send e-mail
   echo "Image md5sum:"
   cat $img.md5sum
@@ -54,10 +60,10 @@ touch $burnlockfile
   cat $img.stat
   echo
   cat $logfile
-} | mailx -s "DVD burned.  File it as ${img%.*}" $mailto > $logfile 2>&1
+} | mailx -s "DVD burned.  File as ${img%.*}" $mailto > $logfile 2>&1
 
 # Two lines in the stat file indicate two successful burns.  Clean-up the image.
-if [ "$(wc -l $img.stat 2>/dev/null)" == "2" ]; then
+if [ "$(wc -l $img.stat 2>/dev/null | awk '{print$1}')" == "2" ]; then
   # Burned the image twice.  Removing it and associated files!
   rm -f $img{,.md5sum,.stat}
   [ -d $img.mnt ] && rmdir $img.mnt