Added support for 3rd argument = mount dir

Fixed bug related to automatically finding mountdir.
Added usage verbosity.
Added failure to eject the disk checking.

diff --git a/scripts/restore-header.sh b/scripts/restore-header.sh
index 8374076c69134d8cf085f70f14ea56af919b1b05..b05d19c38314e2c73adf6fe6dd00749c0f9bc427 100755 (executable)
--- a/scripts/restore-header.sh
+++ b/scripts/restore-header.sh
@@ -8,7 +8,9 @@ if ! mkdir $rundir; then
 fi
 
 unset CDPATH
-export mountdir=$(cd $(dirname $0) && pwd)
+if [ -z "$3" ]; then
+  export mountdir=$(cd $(dirname $0) && pwd -P)
+fi
 
 SKIP=`awk '/^__ARCHIVE_FOLLOWS__/ { print NR + 1; exit 0; }' $0`
 

diff --git a/scripts/restore-script.sh b/scripts/restore-script.sh
index 6592d72a612f8360d74e473bbd916387637931d4..66ac4fb5b4da27c64842c96444daf04313059a71 100755 (executable)
--- a/scripts/restore-script.sh
+++ b/scripts/restore-script.sh
@@ -1,5 +1,14 @@
 #!/bin/sh
 
+function err() {
+  echo 2>&1 "-E- $1"
+  exit 1
+}
+
+if [ ! -z "$3" ]; then
+  mountdir=$3 
+fi
+
 if [ -z "$mountdir" ]; then
   echo >&2 '$mountdir must be set'
   exit 1
@@ -12,9 +21,12 @@ fi
 
 export PATH=${rundir%%/}:/bin:/usr/bin:/sbin:/usr/sbin:/sw/bin
 
-if [ $# != 2 -o ! -d "$1" -o ! -d "$2" ]; then
-  echo >&2 "Usage: $0 <source-directory> <target-directory>"
-  echo >&2 "Example: $0 / /"
+if [ ! -d "$1" -o ! -d "$2" ]; then
+  echo >&2 "Usage: $0 <source-dir> <target-dir> [<mnt-dir>]"
+  echo >&2 "       source-dir - directory on backup disks to restore from"
+  echo >&2 "       target-dir - directory to restore files to"
+  echo >&2 "       mnt-dir    - directory where backup disk is mounted (optional)"
+  echo >&2 "Example: $0 / / /mnt/cdrom"
   exit 1
 fi
 
@@ -34,7 +46,9 @@ 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 >&2 "Please insert backup disk:  $date"
+    echo >&2 "Press Enter to continue"
     read bogus
     eject -t $device
 
@@ -44,10 +58,10 @@ for date in $dates; do
     if grep -q $date ${mountdir%%/}/backup-status.txt; then
       success=true
     else
-      echo >&2 "This doesn't seem to be the right disk."
+      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 | rsync $rsyncopts ${mountdir%%/}/ ${2%%/}/
+  cat $dbfile | files-from-date.sh $date | grep -z -e "${1}" | rsync $rsyncopts ${mountdir%%/}/ ${2%%/}/
 done