X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=scripts%2Frestore-script.sh;h=ed42a96bd700f00108b1ba99a6b3026b1afd83a0;hb=00cc94878d3cf4de6b6739e22e49d3c568388b89;hp=9d9baabc9389a496e5a0db8771844331befe7f6b;hpb=2b19c613bbb418da0fff6cddaa01a21b87271cb1;p=backups%2F.git

diff --git a/scripts/restore-script.sh b/scripts/restore-script.sh
index 9d9baab..ed42a96 100755
--- a/scripts/restore-script.sh
+++ b/scripts/restore-script.sh
@@ -10,9 +10,9 @@ function err() {
 [ -z "$mountdir" ] && err '$mountdir must be set'
 [ -z "$rundir"   ] && err '$rundir must be set'
 
-export PATH=${rundir%%/}:/bin:/usr/bin:/sbin:/usr/sbin:/sw/bin
+export PATH=${rundir%/}:/bin:/usr/bin:/sbin:/usr/sbin:/sw/bin
 
-if [ ! -d "$mountdir$1" -o ! -d "$2" ]; then
+if [ ! -z "$1" -o ! -d "$2" ]; then
   err "
 Usage: $0 <source-dir> <relocate-dir> [<mnt-dir>]
        source-dir   - directory on backup disks to restore from (relative to $mountdir)
@@ -27,35 +27,43 @@ Usage: $0 <source-dir> <relocate-dir> [<mnt-dir>]
 "
 fi
 
-device=$(mount | grep "on ${mountdir%%/} " | awk '{print$1}')
+device=$(mount | grep "on ${mountdir%/} " | awk '{print$1}')
 
 [ -z "$device" ] && err "Cannot determine cdrom device"
 
-cp ${mountdir%%/}/backups.db ${mountdir%%/}/backup-status.txt $rundir
-dbfile=${rundir%%/}/backups.db
+cp ${mountdir%/}/backups.db ${mountdir%/}/backup-status.txt $rundir
+dbfile=${rundir%/}/backups.db
 
 dates=$(cat $dbfile | list-dates.sh)
 
 for date in $dates; do
-  success=false
-  while ! $success; do
-    eject $device
-    [ $? != 0 ] && err "Cannot eject the disk. Drive is busy. Run lsof $mountdir to see why."
-    echo "Please insert backup disk:  $date"
-    echo "Press Enter to continue"
-    read bogus
-    eject -t $device
-
-    # Mount the media
-    mount -t ext2 $device ${mountdir%%/}
-
-    if grep -q $date ${mountdir%%/}/backup-status.txt; then
-      success=true
-    else
-      echo "This doesn't seem to be the right disk."
-    fi
-  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%%/}/
+  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
+      [ $? != 0 ] && err "Cannot eject the disk. Drive is busy. Run lsof $mountdir to see why."
+      echo "Please insert backup disk:  $date"
+      echo "Press Enter to continue"
+      read bogus
+      eject -t $device
+
+      # Mount the media
+      mount -t ext2 $device ${mountdir%/}
+
+      if grep -q $date ${mountdir%/}/backup-status.txt; then
+        success=true
+      else
+        echo "This doesn't seem to be the right disk."
+      fi
+    done
+
+    rsyncopts="-W -H -S -l -p -t -g -o -0 --files-from=- --stats --progress"
+    cat $filelist | rsync $rsyncopts ${mountdir%/}/ ${2%/}/
+  else
+    echo "No files are needed from disk: $date.  Skipping it."
+  fi
+  rm -f $filelist
 done