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

[backmeupscotty.git] / backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index c1fa9da8387aea23f276e1092c8abf31c9fd191c..b3c270389a19cef8603d81a8fb9a4a9a638f88f0 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -110,14 +110,14 @@ 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..."
 
-    cleanup_abrt
+    cleanup_abort
 
     if [ $(jobs -p) ]; then
        scottyerror TERMinating remaining child processes...
@@ -131,46 +131,41 @@ function prepare {
     scottyinfo "No prepare function was defined."
 }
 
-function _prepare {
-    prepare
-}
-
 function cleanup_normal {
     scottyinfo "No cleanup_normal function was defined."
 }
 
-function _cleanup_normal {
-    cleanup_normal
-    deleteLock
-}
-
 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
 
-    trap _cleanup_abrt EXIT
+    trap _cleanup_abort EXIT
 
-    _prepare
+    prepare
     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
-
-while getopts "qn:" opt; do
-    case $opt in
-       q)
-           exec > /dev/null
-           ;;
-       n)
-           BACKUP_RUNEVERYNTHDAY=$OPTARG
-           ;;
-    esac
-done