X-Git-Url: http://git.treefish.org/~alex/backmeupscotty.git/blobdiff_plain/f75a0bf675b1ba2f68d5aede1d9be210b54490d4..34bf4c5425720dc3a9e6bec062ff418ba99d5d39:/backmeupscotty?ds=sidebyside

diff --git a/backmeupscotty b/backmeupscotty
index efda418..c7652bb 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)
 
@@ -110,41 +123,47 @@ function prepare {
     scottyinfo "Preparing for sync"
 }
 
-function cleanup_abrt {
-    scottyinfo "No cleanup_abrt function was defined."
-}
-
-function _cleanup_abrt {
+function cleanup_abort {
     scottyerror "Caught exit signal! Cleaning up..."
 
-    cleanup_abrt
+    cleanup ABORT
 
     if [ $(jobs -p) ]; then
 	scottyerror TERMinating remaining child processes...
 	kill $(jobs -p)
     fi
+
     deleteLock
+
     exit
 }
 
-function prepare {
-    scottyinfo "No prepare function was defined."
+function cleanup {
+    scottyinfo "No cleanup function was defined."
 }
 
-function _prepare {
-    prepare
+function prepare {
+    scottyinfo "No prepare function was defined."
 }
 
 function cleanup_normal {
-    scottyinfo "No cleanup_normal function was defined."
+    cleanup
+    deleteLock
 }
 
-function _cleanup_normal {
-    cleanup_normal
+function printhelp {
+    cat <<EOF
+Usage: $(basename $0) [OPTION]...
+
+Recognized options:
+  -q   Only output errors
+  -n   Run only on nth day
+  -h   Print out this help
+EOF
 }
 
 function backmeupscotty {
-    while getopts "qn:" opt; do
+    while getopts "qn:h" opt; do
 	case $opt in
 	    q)
 		exec > /dev/null
@@ -152,21 +171,32 @@ function backmeupscotty {
 	    n)
 		BACKUP_RUNEVERYNTHDAY=$OPTARG
 		;;
+	    h)
+		printhelp
+                exit 0
+                ;;
 	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
+	scottyinfo "The latest backup is too old."
+    else
+	scottyinfo "No backup has to be done. Exiting."
 	exit 0
     fi
 
-    trap _cleanup_abrt EXIT
+    scottyinfo "Performing backup."
+
+    trap cleanup_abort EXIT
 
-    _prepare
+    prepare
     scottysync
-    _cleanup_normal
 
-    trap deleteLock EXIT
+    trap cleanup_normal EXIT
+
+    exit 0
 }
 
 if ! mkdir /tmp/$(basename $0).lock; then