X-Git-Url: https://git.treefish.org/~alex/backmeupscotty.git/blobdiff_plain/333d926de93d4427e4c32c52e7dd18649132a00b..055e3ffadca7fb5b75a8625de2005f40c888afa9:/backmeupscotty?ds=inline

diff --git a/backmeupscotty b/backmeupscotty
index c1fa9da..88a8739 100644
--- 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,46 +129,56 @@ 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
-    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 {
+    while getopts "qn:h" opt; do
+	case $opt in
+	    q)
+		exec > /dev/null
+		;;
+	    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 - EXIT
+    trap cleanup_normal 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
-
-while getopts "qn:" opt; do
-    case $opt in
-	q)
-	    exec > /dev/null
-	    ;;
-	n)
-	    BACKUP_RUNEVERYNTHDAY=$OPTARG
-	    ;;
-    esac
-done