From 23d556c8a5e7dc98536c841b102c2e777c182314 Mon Sep 17 00:00:00 2001
From: Filippo Cremonese <filippocremonese@rev.ng>
Date: Thu, 15 Oct 2020 17:48:49 +0200
Subject: [PATCH] Better error condition handling in extract.sh
---
.orchestra/support/extract.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.orchestra/support/extract.sh b/.orchestra/support/extract.sh
index aa099c1..bbf9686 100755
--- a/.orchestra/support/extract.sh
+++ b/.orchestra/support/extract.sh
@@ -41,7 +41,8 @@ if [ -z "${ARCHIVE_FILENAME}" ]; then
fi
TMP_ARCHIVE_FILENAME="${ARCHIVE_FILENAME}.tmp"
-trap 'rm ${SRC_ARCHIVE_DIR}/${TMP_ARCHIVE_FILENAME} || true' INT QUIT TERM EXIT
+TMP_ARCHIVE_PATH="${SRC_ARCHIVE_DIR}/${TMP_ARCHIVE_FILENAME}"
+trap 'if [ -e "$TMP_ARCHIVE_PATH" ]; then rm "$TMP_ARCHIVE_PATH"; fi' INT QUIT TERM EXIT
if [ ! -e "${SRC_ARCHIVE_DIR}/${ARCHIVE_FILENAME}" ]; then
echo "Downloading source archive to ${SRC_ARCHIVE_DIR}/${ARCHIVE_FILENAME}"
--
GitLab