X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=scripts%2Fdrive.sh;h=9f17f83c87688d7fab67732d9542b6ba39374793;hb=4904b81497ceb8dc16d334b7fe3cc54b95a4cffe;hp=a75c20f49bd3aff8d230e581f5f885f413f662cc;hpb=9f95453a2b3a4ffde7c553b93a6cac6eec618958;p=backups%2F.git

diff --git a/scripts/drive.sh b/scripts/drive.sh
index a75c20f..9f17f83 100755
--- a/scripts/drive.sh
+++ b/scripts/drive.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
 
 scriptsdir=$(dirname $0)
-bindir="$scriptsdir/../build"
 
-export PATH=$scriptsdir:$bindir:$PATH
+export PATH=$scriptsdir:$PATH
 
 # file locations and other values
 today=$(date +%Y%m%d%H%M%S)
@@ -14,14 +13,15 @@ backupdb="$datadir/backups.db"
 backups="$tmpdir/backup-list.db"
 statusfile="$tmpdir/backup-status.txt"
 isomountdir="/backup/iso-mount"
-isoimage="/backup/iso-mount.iso"
+isoimage="/backup/ISOs/$today.iso"
+restorescript="$scriptsdir/restore.sh"
 
 echo "Creating the iso image in $isoimage"
 touch $isoimage
 # chmod 600 $isoimage
 
 # Create filesystem on iso image here
-dd if=/dev/zero of=$isoimage bs=2048k count=2220
+dd if=/dev/null of=$isoimage bs=2048k count=0 seek=2220
 mke2fs -b 2048 -F $isoimage
 
 echo "Mounting the iso image"
@@ -34,7 +34,12 @@ chmod 700 $tmpdir
 touch $currentfiles
 chmod 600 $currentfiles
 echo "Running find to get the status of files"
-find-cmd.sh /home > $currentfiles
+{
+  for type in d f l; do
+    findformat="$type %#m %u %g %s %CY%Cm%Cd%CH%CM%CS 0 %p\0"
+    find /home -type $type -printf "$findformat"
+  done
+} > $currentfiles
 
 echo "Determining list of files to backup with lsbackups"
 {
@@ -44,13 +49,20 @@ echo "Determining list of files to backup with lsbackups"
 } | lsbackups > $backups 2>$statusfile
 
 echo "Running rsync to pack the image"
-cat $backups | rsync-cmd.sh $isomountdir
+rsyncopts="-l -p -t -g -o -0 --files-from=- --stats --progress"
+cat $backups | rsync $rsyncopts / $isomountdir
 
 echo "Copying over database and status file"
-cp $statusfile $backupdb $isomountdir
+cp $statusfile $backupdb $restorescript $isomountdir
 
+mount -o remount -o ro $isomountdir
+# Should be
 # umount $isomountdir
 
+md5sum $isoimage > $isoimage.md5sum
+
 # Burn the iso image
 # dvdrecord [-dummy] [-overburn] -dao speed=8 dev=[ATAPI:]?,?,? iso-image.iso
+
+# Email me
 cat $statusfile | mailx -s "DVD Image available on ball, burn it!" carl@ecbaldwin.net