From: Carl N Baldwin <cnb@plane.localdomain>
Date: Wed, 30 Nov 2005 02:43:18 +0000 (-0700)
Subject: This logic should bypass asking for a disk if no files are going to be copied from... 
X-Git-Tag: release-0.4~8
X-Git-Url: http://git.pippins.net/embedvideo/%27%20.%20%24this-%3Ephpgw_js_url%20.%20%27/jscalendar/static/%24link?a=commitdiff_plain;h=575a6caced28aeb051f876d1c3db1a8188164685;p=backups%2F.git

This logic should bypass asking for a disk if no files are going to be copied from that disk.
---

diff --git a/scripts/restore-script.sh b/scripts/restore-script.sh
index 0796bef..62042d5 100755
--- a/scripts/restore-script.sh
+++ b/scripts/restore-script.sh
@@ -37,6 +37,10 @@ dbfile=${rundir%%/}/backups.db
 dates=$(cat $dbfile | list-dates.sh)
 
 for date in $dates; do
+  filelist=$(tempfile)
+  # Check to see if files are actually needed from the current disk before requesting it.
+  cat $dbfile | files-from-date.sh $date | grep -z -Z -e "^${1%%/}/" > $filelist
+  if [ -s $filelist ]; then
   success=false
   while ! $success; do
     eject $device
@@ -57,5 +61,9 @@ for date in $dates; do
   done
 
   rsyncopts="-W -H -S -l -p -t -g -o -0 --files-from=- --stats --progress"
-  cat $dbfile | files-from-date.sh $date | grep -z -Z -e "^${1%/}/" | rsync $rsyncopts ${mountdir%%/}/ ${2%%/}/
+  cat $filelist | rsync $rsyncopts ${mountdir%%/}/ ${2%%/}/
+  else
+    echo "No files are needed from disk: $date.  Skipping it."
+  fi
+  rm -f $filelist
 done