From: Carl N Baldwin Date: Wed, 30 Nov 2005 02:44:08 +0000 (-0700) Subject: Only whitespace changes to fix indentation. X-Git-Tag: release-0.4~7 X-Git-Url: http://git.pippins.net/embedvideo/%27%20.%20%24this-%3Ephpgw_js_url%20.%20%27/jscalendar/static/%24link?a=commitdiff_plain;h=630a0aa5bb68026faa94652f9165ba593b084771;p=backups%2F.git Only whitespace changes to fix indentation. --- diff --git a/scripts/restore-script.sh b/scripts/restore-script.sh index 62042d5..daff5e5 100755 --- a/scripts/restore-script.sh +++ b/scripts/restore-script.sh @@ -41,27 +41,27 @@ for date in $dates; do # 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 + 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%%/} + # 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 + 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%%/}/ + 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