From 4e6a9bb8cabd617d7368f55fa75a08bd99ca789c Mon Sep 17 00:00:00 2001
From: Alexander Schmidt <alex@treefish.org>
Date: Fri, 12 Sep 2014 14:42:04 +0200
Subject: [PATCH] Performing backup if nth day or latest backup too old.

---
 backmeupscotty         | 31 +++++++++++++++++++++++++------
 backmeupscotty-example |  4 ++--
 2 files changed, 27 insertions(+), 8 deletions(-)

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
diff --git a/backmeupscotty-example b/backmeupscotty-example
index a028abe..d7a1d07 100755
--- a/backmeupscotty-example
+++ b/backmeupscotty-example
@@ -3,11 +3,11 @@
 . ./backmeupscotty
 
 REMOTE_HOST=localhost
-REMOTE_DIR=/home/regina/backtest/dest
+REMOTE_DIR=/tmp/scotty/dest
 ARCHIVE_KEEPNBACKUPS=10
 ARCHIVE_KEEPNDAYS=0
 BACKUP_RUNEVERYNTHDAY=1
-SYNC_SRC="/home/regina/backtest/source"
+SYNC_SRC="/tmp/scotty/src"
 SYNC_EXC="/gack,/gugu/*"
 
 function prepare {
-- 
2.39.5