X-Git-Url: https://git.treefish.org/~alex/backmeupscotty.git/blobdiff_plain/d0707b3df434a0028ac2e588a8bb7a6a8714d764..5a7e954f6cac6da23598c140cea07f4cd7a91148:/backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index 257c192..3f68b1f 100644
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -111,28 +111,31 @@ function prepare {
 }
 
 function cleanup_abort {
-    scottyinfo "No cleanup_abort function was defined."
-}
-
-function _cleanup_abort {
     scottyerror "Caught exit signal! Cleaning up..."
 
-    cleanup_abort
+    cleanup ABORT
 
     if [ $(jobs -p) ]; then
 	scottyerror TERMinating remaining child processes...
 	kill $(jobs -p)
     fi
+
     deleteLock
+
     exit
 }
 
+function cleanup {
+    scottyinfo "No cleanup function was defined."
+}
+
 function prepare {
     scottyinfo "No prepare function was defined."
 }
 
 function cleanup_normal {
-    scottyinfo "No cleanup_normal function was defined."
+    cleanup
+    deleteLock
 }
 
 function printhelp {
@@ -167,13 +170,12 @@ function backmeupscotty {
 	exit 0
     fi
 
-    trap _cleanup_abort EXIT
+    trap cleanup_abort EXIT
 
     prepare
     scottysync
-    cleanup_normal
 
-    trap deleteLock EXIT
+    trap cleanup_normal EXIT
 
     exit 0
 }