apadana/arkdep
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[arkdep] Improve user interupt handeling

Browse source
This commit is contained in:
Dennis ten Hoove 2025-01-18 22:57:53 +01:00
parent 76637df7fc
commit ff138b607c
No known key found for this signature in database
GPG key ID: 2BA91DC2563B83D1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arkdep
View file

@ -184,6 +184,9 @@ unlock_and_quit () {
touch /tmp/arkdep.lock touch /tmp/arkdep.lock
# Script-wide trap interupt
trap 'echo "User interupt received"; unlock_and_quit 4' INT TERM
## Healthcheck ## Healthcheck
# #
# Set common variables for healthcheck and cleanup, # Set common variables for healthcheck and cleanup,
@ -808,9 +811,6 @@ diff () {
# Deploy a new or update an existing deployment # Deploy a new or update an existing deployment
deploy () { 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 # target and version are optional, if not defined default to primary as defined in
# /arkdep/config and latest # /arkdep/config and latest
if [[ -n $1 ]] && [[ $1 != '-' ]]; then if [[ -n $1 ]] && [[ $1 != '-' ]]; then
@ -1230,7 +1230,7 @@ deploy () {
fi fi
# Image deployment finished, allow for interupts again # 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 # Get list of all tarballs in cache
declare -r tarball_hits=($(ls $arkdep_dir/cache/ | grep -E '.*.tar..*')) declare -r tarball_hits=($(ls $arkdep_dir/cache/ | grep -E '.*.tar..*'))