Clean up

diff --git a/scripts/files-from-date.sh b/scripts/files-from-date.sh
index 80c0ad374ed448f84e8e1af2eb515e8020c042e2..2db6fc228c378165e316fb3a00236dbd464360b7 100755 (executable)
--- a/scripts/files-from-date.sh
+++ b/scripts/files-from-date.sh
@@ -2,4 +2,4 @@
 
 [ $# == 1 ] || exit 1
 
-awk --posix 'BEGIN { RS="\0" } { d=$7; gsub( /^([^ ]*[ ]){7,7}/, "" ); if ( date == d ) printf "%s\0",$0 }' date=$1
+gawk --posix 'BEGIN { RS="\0" } { d=$7; gsub( /^([^ ]*[ ]){7,7}/, "" ); if ( date == d ) printf "%s\0",$0 }' date=$1

diff --git a/scripts/list-dates.sh b/scripts/list-dates.sh
index 1e6b501de6eaf491e34df6a64d7f51253be34c11..ba28d5bdd8efed7d3f9fcc4f808e214bca57ff07 100755 (executable)
--- a/scripts/list-dates.sh
+++ b/scripts/list-dates.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-awk 'BEGIN { RS="\0" } {print$7}' | sort -u
+gawk 'BEGIN { RS="\0" } {print$7}' | sort -u

diff --git a/scripts/restore-script.sh b/scripts/restore-script.sh
index 42fe9000e60ccb06d15fecd529eb5ad336fdc29f..acd90081c17aa632ec6d17c1de9290491935e1d6 100755 (executable)
--- a/scripts/restore-script.sh
+++ b/scripts/restore-script.sh
@@ -1,19 +1,36 @@
 #!/bin/sh
 
-export PATH=$rundir:/bin:/usr/bin
+if [ -z "$mountdir" ]; then
+  echo >&2 '$mountdir must be set'
+  exit 1
+fi
+
+if [ -z "$rundir" ]; then
+  echo >&2 '$rundir must be set'
+  exit 1
+fi
+
+export PATH=${rundir%%/}:/bin:/usr/bin:/sbin:/usr/sbin:/sw/bin
 
-if [ $# != 1 ]; then
+if [ $# != 2 -o ! -d "$1" -o ! -d "$2" ]; then
   echo >&2 "Usage: $0 <source-directory> <target-directory>"
   echo >&2 "Example: $0 / /"
   exit 1
 fi
 
-device=$(mount | grep "on $mountdir " | awk '{print$1}')
+device=$(mount | grep "on ${mountdir%%/} " | awk '{print$1}')
 
-cp $mountdir/backups.db $mountdir/backup-status.txt $rundir
-dbfile=$rundir/backups.db
+if [ -z "$device" ]; then
+  echo >&2 "Cannot determine cdrom device"
+  exit 1
+fi
+
+cp ${mountdir%%/}/backups.db ${mountdir%%/}/backup-status.txt $rundir
+dbfile=${rundir%%/}/backups.db
 
-for date in $(cat $dbfile | list-dates.sh); do
+dates=$(cat $dbfile | list-dates.sh)
+
+for date in $dates; do
   success=false
   while ! $success; do
     eject $device
@@ -22,14 +39,15 @@ for date in $(cat $dbfile | list-dates.sh); do
     eject -t $device
 
     # Mount the media
-    mount -t ext2 $device $mountdir
-    if [ "" != "$(grep -l $date $mountdir/backup-status.txt)" ]; then
+    mount -t ext2 $device ${mountdir%%/}
+
+    if grep -q $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 $mountdir $2
+  rsyncopts="-l -p -t -g -o -0 --files-from=- --stats --progress"
+  cat $dbfile | files-from-date.sh $date | rsync $rsyncopts ${mountdir%%/}/ ${2%%/}/
 done