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=1bf8dccfd4e8326670ef9ef189598d24c6cecc33;hpb=332895f51c79faba592e57ae32363d8c597eb0e1;p=backups%2F.git

diff --git a/scripts/restore-script.sh b/scripts/restore-script.sh
index 1bf8dcc..ed42a96 100755
--- a/scripts/restore-script.sh
+++ b/scripts/restore-script.sh
@@ -1,34 +1,69 @@
 #!/bin/sh
 
-export PATH=$rundir:/bin:/usr/bin
-
-if [ $# != 1 ]; then
-  echo >&2 "Usage: $0 <source-directory> <target-directory>"
-  echo >&2 "Example: $0 / /"
+function err() {
+  echo >&2 "-E- $1"
   exit 1
+}
+
+[ -n "$3" ] && mountdir=$3
+
+[ -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
+
+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)
+       relocate-dir - base directory to restore files to        (usually /)
+       mnt-dir      - directory where backup disk is mounted    (optional)
+
+  Examples:
+    % $0 / / /mnt/cdrom # Restore everything from disks (explicitly specifying dvd mount point.)
+    % $0 / /            # Restore everything from disks
+    % $0 /home /        # Restore only files under /home on disks to /home on the system
+    % $0 /home /home    # Restore files under /home on disks to /home/home on the system (probably not what you want.)
+"
 fi
 
-device=$(mount | grep "on $mountdir " | awk '{print$1}')
-
-cp $mountdir/backups.db $mountdir/backup-status.txt $rundir
-dbfile=$rundir/backups.db
-
-for date in $(cat $dbfile | list-dates.sh); do
-  success=false
-  while ! $success; do
-    eject $device
-    echo >&2 "Please insert backup disk:  $date"
-    read bogus
-
-    # Mount the media
-    mount -t ext2 $device $mountdir
-    if [ "" != "$(grep -l $date $mountdir/backup-status.txt)" ]; then
-      success=true
-    else
-      echo >&2 "This doesn't seem to be the right disk."
-    fi
-  done
-
-  rsyncopts="-l -p -t -g -o -0 --files-from=- --stats --progress "
-  cat $dbfile | files-from-date.sh | rsync $rsyncopts $1 $2
+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
+
+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
+      [ $? != 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