X-Git-Url: https://git.treefish.org/~alex/backmeupscotty.git/blobdiff_plain/333d926de93d4427e4c32c52e7dd18649132a00b..29db4d4c855160100b40cc94c5684882092128df:/backmeupscotty diff --git a/backmeupscotty b/backmeupscotty index c1fa9da..07a2049 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... @@ -141,36 +141,37 @@ function cleanup_normal { 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 scottysync _cleanup_normal - trap - EXIT + trap deleteLock EXIT } 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