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

diff --git a/scripts/restore-script.sh b/scripts/restore-script.sh
index 0796bef2d9155e5d1e99e1a52f66f4bd97710af0..62042d570263fb9d5adbce2f3d5a691e80a4827f 100755 (executable)
--- 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