X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=scripts%2Fdrive.sh;h=dbe6b0b7e074349605af6124c4479e5b05a47ad0;hb=6bf84dfd36b859d1bb2cf43f2fc998eee3fd65cc;hp=1693212a8c5b422e9b229b2e9583b73beed1df78;hpb=b7347b04b24941f3b0a52471daa72597d1ed4645;p=backups%2F.git

diff --git a/scripts/drive.sh b/scripts/drive.sh
index 1693212..dbe6b0b 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)
@@ -15,6 +14,7 @@ backups="$tmpdir/backup-list.db"
 statusfile="$tmpdir/backup-status.txt"
 isomountdir="/backup/iso-mount"
 isoimage="/backup/iso-mount.iso"
+restorescript="$scriptsdir/restore.sh"
 
 echo "Creating the iso image in $isoimage"
 touch $isoimage
@@ -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,10 +49,11 @@ 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
 
 # umount $isomountdir