Deleted zombie prepare function.

[backmeupscotty.git] / backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index efda418d28119de54b1f9fc4617192c8ce8dd34c..e0689a042a60240b16f3d0cfac77a6e0e5c52c4b 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -18,21 +18,32 @@ function scottyerror {
     echo $(upperme): $@ >&2 
 }
 
     echo $(upperme): $@ >&2 
 }
 

+function ssh255 {
+    ssh $@
+    sshret=$?
+
+    if [ $sshret -eq 255 ]; then
+       scottyerror "SSH connection failed!"
+       exit 1
+    else
+       return $sshret
+    fi
+}
+

 function grepbackups {
 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 {
 }
 
 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
 }
 
        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
     then
        return 0
     else


@@ -40,18 +51,32 @@ 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+12)*60*60 )) ]
+       then
+           return 1
+       fi
+    done
+
+    return 0
+}
+

 function scottysync {
     timestamp=$(date +%s)
 
 function scottysync {
     timestamp=$(date +%s)
 

-    scottyinfo Syncing $SYNC_SRC to $REMOTE_HOST:$REMOTE_DIR @$timestamp
+    scottyinfo "Syncing $SYNC_SRC to $REMOTE_HOST:$REMOTE_DIR @$timestamp."

 
     if [ ! -d "$SYNC_SRC" ]; then
 
     if [ ! -d "$SYNC_SRC" ]; then

-       scottyerror Source dir $SYNC_SRC does not exist. Not syncing!
+       scottyerror "Source dir $SYNC_SRC does not exist. Not syncing!"

        return 1
     fi
 
     if [ $(ls -A "$SYNC_SRC" | wc -l) -eq 0 ]; then
        return 1
     fi
 
     if [ $(ls -A "$SYNC_SRC" | wc -l) -eq 0 ]; then

-       scottyerror Source dir $SYNC_SRC is empty. Not syncing!
+       scottyerror "Source dir $SYNC_SRC is empty. Not syncing!"

        return 1
     fi
 
        return 1
     fi
 


@@ -65,16 +90,16 @@ function scottysync {
        rsync_exclude=$(eval echo --exclude={$SYNC_EXC} | tr -d {})
     fi
 
        rsync_exclude=$(eval echo --exclude={$SYNC_EXC} | tr -d {})
     fi
 

-    if (ssh $REMOTE_HOST '[ ! -d '$REMOTE_DIR' ]'); then
-       scottyinfo Creating destination directory $REMOTE_HOST:$REMOTE_DIR
-       ssh $REMOTE_HOST "mkdir $REMOTE_DIR"
+    if (ssh255 $REMOTE_HOST '[ ! -d '$REMOTE_DIR' ]'); then
+       scottyinfo "Creating destination directory $REMOTE_HOST:$REMOTE_DIR."
+       ssh255 $REMOTE_HOST "mkdir $REMOTE_DIR"

     fi
 
     if isIncomplete; then
     fi
 
     if isIncomplete; then

-       scottyerror Continuing old incomplete backup
+       scottyerror "Continuing old incomplete backup."

     fi
 
     fi
 

-    scottyinfo Starting rsync
+    scottyinfo "Starting rsync."

     rsync -e ssh \
        -v -aHAX --numeric-ids --delete --delete-excluded \
        --link-dest=$dir_current \
     rsync -e ssh \
        -v -aHAX --numeric-ids --delete --delete-excluded \
        --link-dest=$dir_current \


@@ -82,8 +107,8 @@ function scottysync {
        $SYNC_SRC/ $REMOTE_HOST:$dir_incomplete/
     
     if [ $? -eq 0 ]; then
        $SYNC_SRC/ $REMOTE_HOST:$dir_incomplete/
     
     if [ $? -eq 0 ]; then

-       scottyinfo Timestamping completed backup and linking to current backup
-       ssh $REMOTE_HOST \
+       scottyinfo "Timestamping completed backup and linking to current backup."
+       ssh255 $REMOTE_HOST \

            "mv $dir_incomplete $dir_timestamped && rm -f $dir_current && ln -s $(basename $dir_timestamped) $dir_current"
     fi
 
            "mv $dir_incomplete $dir_timestamped && rm -f $dir_current && ln -s $(basename $dir_timestamped) $dir_current"
     fi
 


@@ -92,59 +117,48 @@ function scottysync {
        oldestbackuptstamp=$(echo $oldestbackup | cut -d'-' -f1)
 
        if [ $oldestbackuptstamp -lt $(( $(date +%s) - $ARCHIVE_KEEPNDAYS*60*60*24 )) ]; then
        oldestbackuptstamp=$(echo $oldestbackup | cut -d'-' -f1)
 
        if [ $oldestbackuptstamp -lt $(( $(date +%s) - $ARCHIVE_KEEPNDAYS*60*60*24 )) ]; then

-           scottyinfo Removing old backup $oldestbackup
-           ssh $REMOTE_HOST rm -r "$REMOTE_DIR/$oldestbackup"
+           scottyinfo "Removing old backup $oldestbackup."
+           ssh255 $REMOTE_HOST rm -r "$REMOTE_DIR/$oldestbackup"

        else
            break
        fi
     done
 }
 
        else
            break
        fi
     done
 }
 

-function deleteLock {
-    if ! rmdir /tmp/$(basename $0).lock; then
-       scottyerror "Could not delete lockfile /tmp/$(basename $0).lock!"
-    fi
-}
-
-function prepare {
-    scottyinfo "Preparing for sync"
-}
-
-function cleanup_abrt {
-    scottyinfo "No cleanup_abrt function was defined."
-}
-
-function _cleanup_abrt {
-    scottyerror "Caught exit signal! Cleaning up..."
+function cleanup_abort {
+    scottyerror "Caught exit signal! Cleaning up."

 
 

-    cleanup_abrt
+    cleanup ABORT

 
     if [ $(jobs -p) ]; then
 
     if [ $(jobs -p) ]; then

-       scottyerror TERMinating remaining child processes...
+       scottyerror "TERMinating remaining child processes."

        kill $(jobs -p)
     fi
        kill $(jobs -p)
     fi

-    deleteLock
+

     exit
 }
 
     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."
-}
+function printhelp {
+    cat <<EOF
+Usage: $(basename $0) [OPTION]...

 
 

-function _cleanup_normal {
-    cleanup_normal
+Recognized options:
+  -q   Only output errors
+  -n   Run only on nth day
+  -h   Print out this help
+EOF

 }
 
 function backmeupscotty {
 }
 
 function backmeupscotty {

-    while getopts "qn:" opt; do
+    while getopts "qn:h" opt; do

        case $opt in
            q)
                exec > /dev/null
        case $opt in
            q)
                exec > /dev/null


@@ -152,26 +166,39 @@ function backmeupscotty {
            n)
                BACKUP_RUNEVERYNTHDAY=$OPTARG
                ;;
            n)
                BACKUP_RUNEVERYNTHDAY=$OPTARG
                ;;

+           h)
+               printhelp
+                exit 0
+                ;;

        esac
     done
        esac
     done

+    
+    ssh255 $REMOTE_HOST exit

 
 

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

-    trap _cleanup_abrt EXIT
+    scottyinfo "Performing backup."

 
 

-    _prepare
+    trap cleanup_abort EXIT
+
+    prepare

     scottysync
     scottysync

-    _cleanup_normal

 
 

-    trap deleteLock EXIT
+    trap cleanup EXIT
+
+    exit 0

 }
 
 }
 

-if ! mkdir /tmp/$(basename $0).lock; then
+exec 200>/var/run/$(basename $0).pid
+if ! flock -n 200; then

     scottyerror "Another instance of $(basename $0) is still running!"
     exit 1
     scottyerror "Another instance of $(basename $0) is still running!"
     exit 1

-else
-    trap deleteLock EXIT

 fi
 fi

+echo $$ 1>&200