Added placeholder cleanup function.

[backmeupscotty.git] / backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index c1fa9da8387aea23f276e1092c8abf31c9fd191c..3f68b1f9a91cc95d318443017f47b0faa15c7502 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -110,67 +110,79 @@ function prepare {
     scottyinfo "Preparing for sync"
 }
 
     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..."
 
     scottyerror "Caught exit signal! Cleaning up..."
 

-    cleanup_abrt
+    cleanup ABORT

 
     if [ $(jobs -p) ]; then
        scottyerror TERMinating remaining child processes...
        kill $(jobs -p)
     fi
 
     if [ $(jobs -p) ]; then
        scottyerror TERMinating remaining child processes...
        kill $(jobs -p)
     fi

+

     deleteLock
     deleteLock

+

     exit
 }
 
     exit
 }
 

-function prepare {
-    scottyinfo "No prepare function was defined."
+function cleanup {
+    scottyinfo "No cleanup function was defined."

 }
 
 }
 

-function _prepare {
-    prepare
+function prepare {
+    scottyinfo "No prepare function was defined."

 }
 
 function cleanup_normal {
 }
 
 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 {
 }
 
 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
 
     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
     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
 }
 
 if ! mkdir /tmp/$(basename $0).lock; then
     scottyerror "Another instance of $(basename $0) is still running!"
     exit 1

+else
+    trap deleteLock EXIT

 fi
 fi

-
-while getopts "qn:" opt; do
-    case $opt in
-       q)
-           exec > /dev/null
-           ;;
-       n)
-           BACKUP_RUNEVERYNTHDAY=$OPTARG
-           ;;
-    esac
-done