From 0bfdfe36a0580384ab8dc99d94ab55426bcf58fc Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Thu, 28 Oct 2021 22:41:35 +0100 Subject: [PATCH] Make sure there are job for quickget to kill. Close #169 --- quickget | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/quickget b/quickget index f4876c7..e8606c5 100755 --- a/quickget +++ b/quickget @@ -23,13 +23,11 @@ # } # 6. Add new OS to the argument parser at the bottom of the script -trap 'kill $(jobs -p)' EXIT - -if ((BASH_VERSINFO[0] < 4)) -then - echo "Sorry, you need bash 4.0 or newer to run this script." - exit 1 -fi +function cleanup() { + if [ -n "$(jobs -p)" ]; then + kill $(jobs -p) + fi +} function pretty_name() { local SIMPLE_NAME="" @@ -965,6 +963,14 @@ function get_windows() { make_vm_config "${FILE_NAME}" "virtio-win.iso" } +trap cleanup EXIT + +if ((BASH_VERSINFO[0] < 4)) +then + echo "Sorry, you need bash 4.0 or newer to run this script." + exit 1 +fi + LANGS=() languages_windows