Stderr if latest backup is half a day too old.

[backmeupscotty.git] / backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index 3f68b1f9a91cc95d318443017f47b0faa15c7502..3ee85c91ba37541eb04d831d78fba98a09ca4868 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -18,21 +18,32 @@ function scottyerror {
     echo $(upperme): $@ >&2 
 }
 
+function ssh255 {
+    ssh $@
+    sshret=$?
+
+    if [ $sshret -eq 255 ]; then
+       scottyerror "SSH connection failed!"
+       exit 1
+    else
+       return $sshret
+    fi
+}
+
 function grepbackups {
-    ssh $REMOTE_HOST "ls $REMOTE_DIR" | grep -E '[0-9]+-[0-9]+'
+    ssh255 $REMOTE_HOST "ls $REMOTE_DIR" | grep -E '[0-9]+-[0-9]+'
 }
 
 function isIncomplete {
-    if ( ssh $REMOTE_HOST '[ -d '$REMOTE_DIR/incomplete' ]' ); then
+    if ( ssh255 $REMOTE_HOST '[ -d '$REMOTE_DIR/incomplete' ]' ); then
        return 0
     else
        return 1
     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 +51,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+12)*60*60 )) ]
+       then
+           return 1
+       fi
+    done
+
+    return 0
+}
+
 function scottysync {
     timestamp=$(date +%s)
 
@@ -65,9 +90,9 @@ function scottysync {
        rsync_exclude=$(eval echo --exclude={$SYNC_EXC} | tr -d {})
     fi
 
-    if (ssh $REMOTE_HOST '[ ! -d '$REMOTE_DIR' ]'); then
+    if (ssh255 $REMOTE_HOST '[ ! -d '$REMOTE_DIR' ]'); then
        scottyinfo Creating destination directory $REMOTE_HOST:$REMOTE_DIR
-       ssh $REMOTE_HOST "mkdir $REMOTE_DIR"
+       ssh255 $REMOTE_HOST "mkdir $REMOTE_DIR"
     fi
 
     if isIncomplete; then
@@ -83,7 +108,7 @@ function scottysync {
     
     if [ $? -eq 0 ]; then
        scottyinfo Timestamping completed backup and linking to current backup
-       ssh $REMOTE_HOST \
+       ssh255 $REMOTE_HOST \
            "mv $dir_incomplete $dir_timestamped && rm -f $dir_current && ln -s $(basename $dir_timestamped) $dir_current"
     fi
 
@@ -93,7 +118,7 @@ function scottysync {
 
        if [ $oldestbackuptstamp -lt $(( $(date +%s) - $ARCHIVE_KEEPNDAYS*60*60*24 )) ]; then
            scottyinfo Removing old backup $oldestbackup
-           ssh $REMOTE_HOST rm -r "$REMOTE_DIR/$oldestbackup"
+           ssh255 $REMOTE_HOST rm -r "$REMOTE_DIR/$oldestbackup"
        else
            break
        fi
@@ -165,11 +190,19 @@ function backmeupscotty {
        esac
     done
     
-    if ! isIncompleteOrNthDay; then
-       scottyinfo "This is not the nth day and no incomplete backup exists."
+    ssh255 $REMOTE_HOST exit
+
+    if latestTooOld; then
+       scottyerror "The latest backup is too old."
+    elif isNthDay; then
+       scottyinfo "This is the nth day."
+    else
+       scottyinfo "No backup has to be done. Exiting."
        exit 0
     fi
 
+    scottyinfo "Performing backup."
+
     trap cleanup_abort EXIT
 
     prepare