Using only one cleanup function with abort switch.

[backmeupscotty.git] / backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index b3c270389a19cef8603d81a8fb9a4a9a638f88f0..88a8739105309639b35be92aefb4835e225616ba 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -111,19 +111,17 @@ 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
 }
 


@@ -132,11 +130,23 @@ function prepare {
 }
 
 function cleanup_normal {
 }
 
 function cleanup_normal {

-    scottyinfo "No cleanup_normal function was defined."
+    cleanup
+    deleteLock
+}
+
+function printhelp {
+    cat <<EOF
+Usage: $(basename $0) [OPTION]...
+
+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


@@ -144,21 +154,24 @@ function backmeupscotty {
            n)
                BACKUP_RUNEVERYNTHDAY=$OPTARG
                ;;
            n)
                BACKUP_RUNEVERYNTHDAY=$OPTARG
                ;;

+           h)
+               printhelp
+                exit 0
+                ;;

        esac
     done
        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_abort EXIT
+    trap cleanup_abort EXIT

 
     prepare
     scottysync
 
     prepare
     scottysync

-    cleanup_normal

 
 

-    trap deleteLock EXIT
+    trap cleanup_normal EXIT

 
     exit 0
 }
 
     exit 0
 }