Use flock for locking.

[backmeupscotty.git] / backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index df18802d226b8b3e9079458edf2870a1ecac5912..44e9c54ae878f3be7eeba2e900a46cb3dcb528e7 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -56,7 +56,7 @@ function latestTooOld {
        tstamp=$(echo $oldbackup | cut -d'-' -f1)
        
        if [ $(( $(date +%s) - $tstamp )) -lt \
        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
        then
            return 1
        fi


@@ -68,15 +68,15 @@ function latestTooOld {
 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
 


@@ -91,15 +91,15 @@ function scottysync {
     fi
 
     if (ssh255 $REMOTE_HOST '[ ! -d '$REMOTE_DIR' ]'); then
     fi
 
     if (ssh255 $REMOTE_HOST '[ ! -d '$REMOTE_DIR' ]'); then

-       scottyinfo Creating destination directory $REMOTE_HOST:$REMOTE_DIR
+       scottyinfo "Creating destination directory $REMOTE_HOST:$REMOTE_DIR."

        ssh255 $REMOTE_HOST "mkdir $REMOTE_DIR"
     fi
 
     if isIncomplete; then
        ssh255 $REMOTE_HOST "mkdir $REMOTE_DIR"
     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 \


@@ -107,7 +107,7 @@ 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
+       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
        ssh255 $REMOTE_HOST \
            "mv $dir_incomplete $dir_timestamped && rm -f $dir_current && ln -s $(basename $dir_timestamped) $dir_current"
     fi


@@ -117,7 +117,7 @@ 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
+           scottyinfo "Removing old backup $oldestbackup."

            ssh255 $REMOTE_HOST rm -r "$REMOTE_DIR/$oldestbackup"
        else
            break
            ssh255 $REMOTE_HOST rm -r "$REMOTE_DIR/$oldestbackup"
        else
            break


@@ -125,28 +125,20 @@ function scottysync {
     done
 }
 
     done
 }
 

-function deleteLock {
-    if ! rmdir /tmp/$(basename $0).lock; then
-       scottyerror "Could not delete lockfile /tmp/$(basename $0).lock!"
-    fi
-}
-

 function prepare {
 function prepare {

-    scottyinfo "Preparing for sync"
+    scottyinfo "Preparing for sync."

 }
 
 function cleanup_abort {
 }
 
 function cleanup_abort {

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

 
     cleanup ABORT
 
     if [ $(jobs -p) ]; then
 
     cleanup ABORT
 
     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
 }
 


@@ -158,11 +150,6 @@ function prepare {
     scottyinfo "No prepare function was defined."
 }
 
     scottyinfo "No prepare function was defined."
 }
 

-function cleanup_normal {
-    cleanup
-    deleteLock
-}
-

 function printhelp {
     cat <<EOF
 Usage: $(basename $0) [OPTION]...
 function printhelp {
     cat <<EOF
 Usage: $(basename $0) [OPTION]...


@@ -191,11 +178,11 @@ function backmeupscotty {
     done
     
     ssh255 $REMOTE_HOST exit
     done
     
     ssh255 $REMOTE_HOST exit

-    
-    if isNthDay; then
+
+    if latestTooOld; then
+       scottyerror "The latest backup is too old."
+    elif isNthDay; then

        scottyinfo "This is the nth day."
        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
     else
        scottyinfo "No backup has to be done. Exiting."
        exit 0


@@ -208,14 +195,14 @@ function backmeupscotty {
     prepare
     scottysync
 
     prepare
     scottysync
 

-    trap cleanup_normal EXIT
+    trap cleanup EXIT

 
     exit 0
 }
 
 
     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