From e08749ce58b2d61d5c7be64a600c4fbd1f97f802 Mon Sep 17 00:00:00 2001 From: Gabriela Cervantes Date: Mon, 7 Oct 2024 16:27:27 +0000 Subject: [PATCH] tools/osbuilder/tests: Add trap statement in test images script This PR adds the trap statement in the test images script to clean up tmp files. Signed-off-by: Gabriela Cervantes --- tools/osbuilder/tests/test_images.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/osbuilder/tests/test_images.sh b/tools/osbuilder/tests/test_images.sh index 800496db92..4cfff2c346 100755 --- a/tools/osbuilder/tests/test_images.sh +++ b/tools/osbuilder/tests/test_images.sh @@ -111,6 +111,7 @@ show_stats() local sizes local tmpfile=$(mktemp) + trap 'rm -f $tmpfile' EXIT # images for name in "${!built_images[@]}" @@ -140,8 +141,6 @@ show_stats() "Name" sort -k1,1n -k3,3n "$tmpfile" - - rm -f "${tmpfile}" } @@ -326,13 +325,13 @@ get_distros_config() fi tmpfile=$(mktemp /tmp/osbuilder-$d-config.XXX) + trap 'rm -f $tmpfile' EXIT ${rootfs_builder} -t $d > $tmpfile # Get value of all keys in distroCfg for k in ${!distroCfg[@]}; do distroCfg[$k]="$(awk -v cfgKey=$k 'BEGIN{FS=":\t+"}{if ($1 == cfgKey) print $2}' $tmpfile)" debug "distroCfg[$k]=${distroCfg[$k]}" done - rm -f $tmpfile machinePattern="\<${MACHINE_TYPE}\>" if [[ "${distroCfg[ARCH_EXCLUDE_LIST]}" =~ $machinePattern ]]; then