Some clean-up

[backups/.git] / scripts / drive.sh

diff --git a/scripts/drive.sh b/scripts/drive.sh
index 6ea91a6bae84a8f21f89a4ec6221cd7ba57a27a5..4ea1e54d77ef957e0b96617bd2ecfd99f32e0304 100755 (executable)
--- a/scripts/drive.sh
+++ b/scripts/drive.sh
@@ -6,6 +6,7 @@ bindir="$scriptsdir/../build"
 export PATH=$scriptsdir:$bindir:$PATH
 
 # file locations and other values
+today=$(date +%Y%m%d%H%M%S)
 datadir="/var/lib/backups"
 tmpdir="/dev/shm/backups"
 currentfiles="$tmpdir/files.db"
@@ -14,6 +15,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
@@ -33,16 +35,26 @@ 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"
-cat $currentfiles | lsbackups > $backups 2>$statusfile
+{
+  # lsbackups expects the current date followed by a null before the list of files
+  printf "$today\0"
+  cat $currentfiles
+} | 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