From 8adeef05bcb4f09230eafc37a3c0934093bb2df4 Mon Sep 17 00:00:00 2001 From: fbt Date: Sat, 6 Mar 2021 11:29:30 +0300 Subject: [PATCH] cleanup with a trap Signed-off-by: fbt --- makepkg-ci | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/makepkg-ci b/makepkg-ci index 7c1cb19..1df4c93 100755 --- a/makepkg-ci +++ b/makepkg-ci @@ -1,19 +1,23 @@ #!/usr/bin/env bash shopt -s nullglob +cleanup() { rm -rf "$tmpdir"; } +trap 'cleanup' EXIT + did="pkg-build-$$.$SRANDOM" -mkdir "/tmp/$did" +tmpdir="/tmp/$did" +mkdir "$tmpdir" pkg_dest=$1 pkg_url=$2 mkdir -p "$pkg_dest" || exit 1 -git clone "$pkg_url" "/tmp/$did" -cd "/tmp/$did" +git clone "$pkg_url" "$tmpdir" +cd "$tmpdir" makepkg-podman --noconfirm -sL -artifacts=( "/tmp/$did/"*.pkg.* ) +artifacts=( "$tmpdir/"*.pkg.* ) for i in "${artifacts[@]}"; do i_name="${i##*/}" @@ -26,6 +30,3 @@ for i in "${artifacts[@]}"; do cp -vn "$i" "$pkg_dest" fi done - -# cleanup -rm -rf "/tmp/$did"