projects
/
backups
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix logic to tell if 15 days have past since last backup.
[backups/.git]
/
scripts
/
restore-script.sh
diff --git
a/scripts/restore-script.sh
b/scripts/restore-script.sh
index 42fe9000e60ccb06d15fecd529eb5ad336fdc29f..6592d72a612f8360d74e473bbd916387637931d4 100755
(executable)
--- a/
scripts/restore-script.sh
+++ b/
scripts/restore-script.sh
@@
-1,19
+1,36
@@
#!/bin/sh
#!/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
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
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
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
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="-
W -H -S -l -p -t -g -o -0 --files-from=- --stats --progress
"
+ cat $dbfile | files-from-date.sh
$date | rsync $rsyncopts ${mountdir%%/}/ ${2%%/}/
done
done