X-Git-Url: http://git.treefish.org/~alex/backmeupscotty.git/blobdiff_plain/f75a0bf675b1ba2f68d5aede1d9be210b54490d4..10c111b53ee316fa7f2b3dd027730043e4ea92b2:/backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index efda418..b3c2703 100644
--- 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,18 +131,10 @@ 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
-}
-
 function backmeupscotty {
     while getopts "qn:" opt; do
 	case $opt in
@@ -160,13 +152,15 @@ function backmeupscotty {
 	exit 0
     fi
 
-    trap _cleanup_abrt EXIT
+    trap _cleanup_abort EXIT
 
-    _prepare
+    prepare
     scottysync
-    _cleanup_normal
+    cleanup_normal
 
     trap deleteLock EXIT
+
+    exit 0
 }
 
 if ! mkdir /tmp/$(basename $0).lock; then