X-Git-Url: https://git.treefish.org/~alex/backmeupscotty.git/blobdiff_plain/5a7e954f6cac6da23598c140cea07f4cd7a91148..4e6a9bb8cabd617d7368f55fa75a08bd99ca789c:/backmeupscotty?ds=sidebyside

diff --git a/backmeupscotty b/backmeupscotty
index 3f68b1f..35ec754 100644
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -30,9 +30,8 @@ function isIncomplete {
     fi
 }
 
-function isIncompleteOrNthDay {
-    if isIncomplete || \
-	[ $(( ( $(date +%s) / (60*60*24) ) % $BACKUP_RUNEVERYNTHDAY )) -eq 0 ]; 
+function isNthDay {
+    if [ $(( ( $(date +%s) / (60*60*24) ) % $BACKUP_RUNEVERYNTHDAY )) -eq 0 ]; 
     then
 	return 0
     else
@@ -40,6 +39,20 @@ function isIncompleteOrNthDay {
     fi	
 }
 
+function latestTooOld {
+    for oldbackup in $(grepbackups); do
+	tstamp=$(echo $oldbackup | cut -d'-' -f1)
+	
+	if [ $(( $(date +%s) - $tstamp )) -lt \
+	    $(( $BACKUP_RUNEVERYNTHDAY*24*60*60 )) ]
+	then
+	    return 1
+	fi
+    done
+
+    return 0
+}
+
 function scottysync {
     timestamp=$(date +%s)
 
@@ -164,12 +177,18 @@ function backmeupscotty {
                 ;;
 	esac
     done
-    
-    if ! isIncompleteOrNthDay; then
-	scottyinfo "This is not the nth day and no incomplete backup exists."
+
+    if isNthDay; then
+	scottyinfo "This is the nth day."
+    elif latestTooOld; then
+	scottyerror "The latest backup is too old."
+    else
+	scottyinfo "No backup has to be done. Exiting."
 	exit 0
     fi
 
+    scottyinfo "Performing backup."
+
     trap cleanup_abort EXIT
 
     prepare