Using only one cleanup function with abort switch.

[backmeupscotty.git] / backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index efda418d28119de54b1f9fc4617192c8ce8dd34c..88a8739105309639b35be92aefb4835e225616ba 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -110,20 +110,18 @@ function prepare {
     scottyinfo "Preparing for sync"
 }
 
-function cleanup_abrt {
-    scottyinfo "No cleanup_abrt function was defined."
-}
-
-function _cleanup_abrt {
+function cleanup_abort {
     scottyerror "Caught exit signal! Cleaning up..."
 
-    cleanup_abrt
+    cleanup ABORT
 
     if [ $(jobs -p) ]; then
        scottyerror TERMinating remaining child processes...
        kill $(jobs -p)
     fi
+
     deleteLock
+
     exit
 }
 
@@ -131,20 +129,24 @@ function prepare {
     scottyinfo "No prepare function was defined."
 }
 
-function _prepare {
-    prepare
-}
-
 function cleanup_normal {
-    scottyinfo "No cleanup_normal function was defined."
+    cleanup
+    deleteLock
 }
 
-function _cleanup_normal {
-    cleanup_normal
+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 {
-    while getopts "qn:" opt; do
+    while getopts "qn:h" opt; do
        case $opt in
            q)
                exec > /dev/null
@@ -152,21 +154,26 @@ function backmeupscotty {
            n)
                BACKUP_RUNEVERYNTHDAY=$OPTARG
                ;;
+           h)
+               printhelp
+                exit 0
+                ;;
        esac
     done
-
+    
     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
-    _cleanup_normal
 
-    trap deleteLock EXIT
+    trap cleanup_normal EXIT
+
+    exit 0
 }
 
 if ! mkdir /tmp/$(basename $0).lock; then