X-Git-Url: https://git.treefish.org/~alex/backmeupscotty.git/blobdiff_plain/d0707b3df434a0028ac2e588a8bb7a6a8714d764..3225479b4910b406043c1e2169f6768b46628686:/backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index 257c192..4f0dc9a 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)
 
@@ -111,28 +124,31 @@ function prepare {
 }
 
 function cleanup_abort {
-    scottyinfo "No cleanup_abort function was defined."
-}
-
-function _cleanup_abort {
     scottyerror "Caught exit signal! Cleaning up..."
 
-    cleanup_abort
+    cleanup ABORT
 
     if [ $(jobs -p) ]; then
 	scottyerror TERMinating remaining child processes...
 	kill $(jobs -p)
     fi
+
     deleteLock
+
     exit
 }
 
+function cleanup {
+    scottyinfo "No cleanup function was defined."
+}
+
 function prepare {
     scottyinfo "No prepare function was defined."
 }
 
 function cleanup_normal {
-    scottyinfo "No cleanup_normal function was defined."
+    cleanup
+    deleteLock
 }
 
 function printhelp {
@@ -161,19 +177,29 @@ function backmeupscotty {
                 ;;
 	esac
     done
-    
-    if ! isIncompleteOrNthDay; then
-	scottyinfo "This is not the nth day and no incomplete backup exists."
+
+    if (! ssh $REMOTE_HOST exit); then
+	scottyerror "Could not establish SSH connection to $REMOTE_HOST!"
+	exit 1
+    fi
+
+    if isNthDay; then
+	scottyinfo "This is the nth day."
+    elif latestTooOld; then
+	scottyinfo "The latest backup is too old."
+    else
+	scottyinfo "No backup has to be done. Exiting."
 	exit 0
     fi
 
-    trap _cleanup_abort EXIT
+    scottyinfo "Performing backup."
+
+    trap cleanup_abort EXIT
 
     prepare
     scottysync
-    cleanup_normal
 
-    trap deleteLock EXIT
+    trap cleanup_normal EXIT
 
     exit 0
 }