From 625a65bee0fa6c96a649b4a02d18da2b6670a0f7 Mon Sep 17 00:00:00 2001 From: deajan Date: Wed, 30 Nov 2016 14:21:53 +0100 Subject: [PATCH] Moved trap functions later in init phase --- dev/n_obackup.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dev/n_obackup.sh b/dev/n_obackup.sh index 3412a0a..9cc10ad 100755 --- a/dev/n_obackup.sh +++ b/dev/n_obackup.sh @@ -1457,11 +1457,6 @@ function RotateBackups { fi } -function SetTraps { - trap TrapStop INT QUIT TERM HUP - trap TrapQuit EXIT -} - function Init { __CheckArguments 0 $# ${FUNCNAME[0]} "$@" #__WITH_PARANOIA_DEBUG @@ -1469,6 +1464,9 @@ function Init { local hosturiandpath local hosturi + trap TrapStop INT QUIT TERM HUP + trap TrapQuit EXIT + ## Test if target dir is a ssh uri, and if yes, break it down it its values if [ "${REMOTE_SYSTEM_URI:0:6}" == "ssh://" ] && [ "$BACKUP_TYPE" != "local" ]; then REMOTE_OPERATION="yes" @@ -1671,7 +1669,6 @@ function GetCommandlineArguments { done } -SetTraps GetCommandlineArguments "$@" if [ "$_DECRYPT_MODE" == true ]; then CheckCryptEnvironnment