Added SSH connection check.

[backmeupscotty.git] / backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index 257c1927d12c0be291a98268e3f7071d01dc35a6..9087a17c2a2064fb8a7a031ee783caaed7ed3c52 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -30,9 +30,8 @@ function isIncomplete {
     fi
 }
 
     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
     then
        return 0
     else


@@ -40,6 +39,20 @@ function isIncompleteOrNthDay {
     fi 
 }
 
     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)
 
 function scottysync {
     timestamp=$(date +%s)
 


@@ -111,28 +124,31 @@ function prepare {
 }
 
 function cleanup_abort {
 }
 
 function cleanup_abort {

-    scottyinfo "No cleanup_abort function was defined."
-}
-
-function _cleanup_abort {

     scottyerror "Caught exit signal! Cleaning up..."
 
     scottyerror "Caught exit signal! Cleaning up..."
 

-    cleanup_abort
+    cleanup ABORT

 
     if [ $(jobs -p) ]; then
        scottyerror TERMinating remaining child processes...
        kill $(jobs -p)
     fi
 
     if [ $(jobs -p) ]; then
        scottyerror TERMinating remaining child processes...
        kill $(jobs -p)
     fi

+

     deleteLock
     deleteLock

+

     exit
 }
 
     exit
 }
 

+function cleanup {
+    scottyinfo "No cleanup function was defined."
+}
+

 function prepare {
     scottyinfo "No prepare function was defined."
 }
 
 function cleanup_normal {
 function prepare {
     scottyinfo "No prepare function was defined."
 }
 
 function cleanup_normal {

-    scottyinfo "No cleanup_normal function was defined."
+    cleanup
+    deleteLock

 }
 
 function printhelp {
 }
 
 function printhelp {


@@ -161,19 +177,29 @@ function backmeupscotty {
                 ;;
        esac
     done
                 ;;
        esac
     done

-    
-    if ! isIncompleteOrNthDay; then
-       scottyinfo "This is not the nth day and no incomplete backup exists."
+
+    if (! ssh -q $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
 
        exit 0
     fi
 

-    trap _cleanup_abort EXIT
+    scottyinfo "Performing backup."
+
+    trap cleanup_abort EXIT

 
     prepare
     scottysync
 
     prepare
     scottysync

-    cleanup_normal

 
 

-    trap deleteLock EXIT
+    trap cleanup_normal EXIT

 
     exit 0
 }
 
     exit 0
 }