Use flock for locking.

[backmeupscotty.git] / backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index 35ec75498b6dc5c70960c13ef144726f3324df0a..44e9c54ae878f3be7eeba2e900a46cb3dcb528e7 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -18,12 +18,24 @@ 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
@@ -44,7 +56,7 @@ function latestTooOld {
        tstamp=$(echo $oldbackup | cut -d'-' -f1)
        
        if [ $(( $(date +%s) - $tstamp )) -lt \
-           $(( $BACKUP_RUNEVERYNTHDAY*24*60*60 )) ]
+           $(( ($BACKUP_RUNEVERYNTHDAY*24+12)*60*60 )) ]
        then
            return 1
        fi
@@ -56,15 +68,15 @@ function latestTooOld {
 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
-       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
-       scottyerror Source dir $SYNC_SRC is empty. Not syncing!
+       scottyerror "Source dir $SYNC_SRC is empty. Not syncing!"
        return 1
     fi
 
@@ -78,16 +90,16 @@ function scottysync {
        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
-       scottyerror Continuing old incomplete backup
+       scottyerror "Continuing old incomplete backup."
     fi
 
-    scottyinfo Starting rsync
+    scottyinfo "Starting rsync."
     rsync -e ssh \
        -v -aHAX --numeric-ids --delete --delete-excluded \
        --link-dest=$dir_current \
@@ -95,8 +107,8 @@ function scottysync {
        $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
 
@@ -105,36 +117,28 @@ function scottysync {
        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
 }
 
-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"
+    scottyinfo "Preparing for sync."
 }
 
 function cleanup_abort {
-    scottyerror "Caught exit signal! Cleaning up..."
+    scottyerror "Caught exit signal! Cleaning up."
 
     cleanup ABORT
 
     if [ $(jobs -p) ]; then
-       scottyerror TERMinating remaining child processes...
+       scottyerror "TERMinating remaining child processes."
        kill $(jobs -p)
     fi
 
-    deleteLock
-
     exit
 }
 
@@ -146,11 +150,6 @@ function prepare {
     scottyinfo "No prepare function was defined."
 }
 
-function cleanup_normal {
-    cleanup
-    deleteLock
-}
-
 function printhelp {
     cat <<EOF
 Usage: $(basename $0) [OPTION]...
@@ -177,11 +176,13 @@ function backmeupscotty {
                 ;;
        esac
     done
+    
+    ssh255 $REMOTE_HOST exit
 
-    if isNthDay; then
-       scottyinfo "This is the nth day."
-    elif latestTooOld; then
+    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
@@ -194,14 +195,14 @@ function backmeupscotty {
     prepare
     scottysync
 
-    trap cleanup_normal 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
-else
-    trap deleteLock EXIT
 fi
+echo $$ 1>&200