X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=scripts%2Fdrive.sh;h=a75c20f49bd3aff8d230e581f5f885f413f662cc;hb=5c8c182b0f51eaa5fca5f917ed5cda5f12fb7366;hp=63ac79c5c7c572c2c7ac1d1a134feb8b6338fb44;hpb=57c4edfa25af631f98166dde7ff1ae9c645ca962;p=backups%2F.git

diff --git a/scripts/drive.sh b/scripts/drive.sh
index 63ac79c..a75c20f 100755
--- a/scripts/drive.sh
+++ b/scripts/drive.sh
@@ -3,27 +3,16 @@
 scriptsdir=$(dirname $0)
 bindir="$scriptsdir/../build"
 
-datadir="/var/lib/backups"
-tmpdir="/dev/shm/backups"
-
-mkdir -p $tmpdir
-chmod 700 $tmpdir
-
 export PATH=$scriptsdir:$bindir:$PATH
 
-files="$tmpdir/files.db"
-touch $files
-chmod 600 $files
-echo "Running find to get the status of files"
-find-cmd.sh /home > $files
-
-db="$datadir/backups.db"
+# 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"
+backupdb="$datadir/backups.db"
 backups="$tmpdir/backup-list.db"
 statusfile="$tmpdir/backup-status.txt"
-
-echo "Determining list of files to backup with lsbackups"
-cat $files | lsbackups > $backups 2>$statusfile
-
 isomountdir="/backup/iso-mount"
 isoimage="/backup/iso-mount.iso"
 
@@ -39,11 +28,26 @@ echo "Mounting the iso image"
 # Mount iso image here
 mount -t ext2 -o loop $isoimage $isomountdir
 
+mkdir -p $tmpdir
+chmod 700 $tmpdir
+
+touch $currentfiles
+chmod 600 $currentfiles
+echo "Running find to get the status of files"
+find-cmd.sh /home > $currentfiles
+
+echo "Determining list of files to backup with lsbackups"
+{
+  # 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
 
 echo "Copying over database and status file"
-cp $statusfile $db $isomountdir
+cp $statusfile $backupdb $isomountdir
 
 # umount $isomountdir