From ff138b607c8228fadda1d971ebd6c13f47b917c8 Mon Sep 17 00:00:00 2001 From: Dennis ten Hoove Date: Sat, 18 Jan 2025 22:57:53 +0100 Subject: [PATCH] [arkdep] Improve user interupt handeling --- arkdep | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arkdep b/arkdep index dbdec2b..5be8e66 100755 --- a/arkdep +++ b/arkdep @@ -184,6 +184,9 @@ unlock_and_quit () { touch /tmp/arkdep.lock +# Script-wide trap interupt +trap 'echo "User interupt received"; unlock_and_quit 4' INT TERM + ## Healthcheck # # Set common variables for healthcheck and cleanup, @@ -808,9 +811,6 @@ diff () { # Deploy a new or update an existing deployment deploy () { - # Allow for a clean shutdown, later this is blocked once deployment starts - trap 'echo "User interupt received, interupting download"; unlock_and_quit 4' INT TERM - # target and version are optional, if not defined default to primary as defined in # /arkdep/config and latest if [[ -n $1 ]] && [[ $1 != '-' ]]; then @@ -1230,7 +1230,7 @@ deploy () { fi # Image deployment finished, allow for interupts again - trap 'echo "User interupt received, canceling cleanup step"; unlock_and_quit 4' INT TERM + trap 'echo "User interupt received"; unlock_and_quit 4' INT TERM # Get list of all tarballs in cache declare -r tarball_hits=($(ls $arkdep_dir/cache/ | grep -E '.*.tar..*'))