Removed some _ functions. Exit at the end of backmeupscotty.

[backmeupscotty.git] / backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index ed41ae2b5a584e03906f3f25d73f92f61d056260..b3c270389a19cef8603d81a8fb9a4a9a638f88f0 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -18,22 +18,6 @@ function scottyerror {
     echo $(upperme): $@ >&2 
 }
 
     echo $(upperme): $@ >&2 
 }
 

-if [ $(pidof -x $(basename $0) | wc -w) -gt 2 ]; then 
-    scottyerror Another instance of $(basename $0) is already running!
-    exit 1
-fi
-
-while getopts "qn:" opt; do
-    case $opt in
-       q)
-           exec > /dev/null
-           ;;
-       n)
-           BACKUP_RUNEVERYNTHDAY=$OPTARG
-           ;;
-    esac
-done
-

 function grepbackups {
     ssh $REMOTE_HOST "ls $REMOTE_DIR" | grep -E '[0-9]+-[0-9]+'
 }
 function grepbackups {
     ssh $REMOTE_HOST "ls $REMOTE_DIR" | grep -E '[0-9]+-[0-9]+'
 }


@@ -116,21 +100,30 @@ 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 {
     scottyinfo "Preparing for sync"
 }
 
 function prepare {
     scottyinfo "Preparing for sync"
 }
 

-function cleanup_abrt {
-    scottyinfo "No cleanup_abrt function was defined."
+function cleanup_abort {
+    scottyinfo "No cleanup_abort function was defined."

 }
 
 }
 

-function _cleanup_abrt {
+function _cleanup_abort {

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

-    cleanup_abrt
+
+    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

     exit
 }
 
     exit
 }
 


@@ -138,29 +131,41 @@ function prepare {
     scottyinfo "No prepare function was defined."
 }
 
     scottyinfo "No prepare function was defined."
 }
 

-function _prepare {
-    prepare
-}
-

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

-function _cleanup_normal {
-    cleanup_normal
-}
-

 function backmeupscotty {
 function backmeupscotty {

+    while getopts "qn:" opt; do
+       case $opt in
+           q)
+               exec > /dev/null
+               ;;
+           n)
+               BACKUP_RUNEVERYNTHDAY=$OPTARG
+               ;;
+       esac
+    done
+

     if ! isIncompleteOrNthDay; then
        scottyinfo "This is not the nth day and no incomplete backup exists."
        exit 0
     fi
 
     if ! isIncompleteOrNthDay; then
        scottyinfo "This is not the nth day and no incomplete backup exists."
        exit 0
     fi
 

-    trap _cleanup_abrt EXIT
+    trap _cleanup_abort EXIT

 
 

-    _prepare
+    prepare

     scottysync
     scottysync

-    _cleanup_normal
+    cleanup_normal
+
+    trap deleteLock EXIT

 
 

-    trap - EXIT
+    exit 0

 }
 }

+
+if ! mkdir /tmp/$(basename $0).lock; then
+    scottyerror "Another instance of $(basename $0) is still running!"
+    exit 1
+else
+    trap deleteLock EXIT
+fi