From 36adce695a2c9c5eb8676c3f8ffa59f18959aedf Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Thu, 28 Nov 2019 11:35:03 +0100
Subject: [PATCH] deb: Ensure cleanup works with read-only files
go get can create read-only files
---
icinga-build-deb-binary | 7 +++++++
icinga-build-deb-source | 7 ++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/icinga-build-deb-binary b/icinga-build-deb-binary
index ce1b758..1b9a9b4 100755
--- a/icinga-build-deb-binary
+++ b/icinga-build-deb-binary
@@ -40,6 +40,12 @@ echo "[ Extracting source to build directory ]"
(
set -ex
cd "${BUILDDIR}/"
+ set -e
+ if [ -d "${ICINGA_BUILD_PROJECT}" ]; then
+ set -x
+ chmod -R u+w "${ICINGA_BUILD_PROJECT}"
+ fi
+ set -x
rm -rf "${ICINGA_BUILD_PROJECT}"
dpkg-source -x ./*.dsc "${ICINGA_BUILD_PROJECT}"
)
@@ -95,6 +101,7 @@ if [ "${ICINGA_BUILD_CLEANUP:=1}" -gt 0 ]; then
echo "[ Cleanup Build Directory ]"
(
set -ex
+ chmod -R u+w "${BUILDDIR:?}/${ICINGA_BUILD_PROJECT}/"
rm -rf "${BUILDDIR:?}/${ICINGA_BUILD_PROJECT}/"
)
fi
diff --git a/icinga-build-deb-source b/icinga-build-deb-source
index 7f3d765..050a651 100755
--- a/icinga-build-deb-source
+++ b/icinga-build-deb-source
@@ -6,7 +6,12 @@ SCRIPT_HOME="$(dirname "$(readlink -f "$0")")"
. "${SCRIPT_HOME}"/functions-debian.sh
(
- set -ex
+ set -e
+ if [ -d "${BUILDDIR}" ]; then
+ set -x
+ chmod -R u+w "${BUILDDIR:?}/"
+ fi
+ set -x
rm -rf "${BUILDDIR:?}/"
)
--
GitLab