Commit 844119d8 authored by Markus Frosch's avatar Markus Frosch 😱

deb: Better implement DEBIAN_FRONTEND

parent b94ed115
Pipeline #3153 passed with stage
in 20 seconds
......@@ -3,8 +3,6 @@
# shellcheck source=functions-common.sh
. "$(dirname "$(readlink -f "$0")")"/functions-common.sh
export DEBIAN_FRONTEND=noninteractive
detect_project() {
dists=( "$(grep -E ^Source: ./*/debian/control | awk '{print $2}' | sort -u)" )
......
......@@ -47,9 +47,9 @@ echo "[ Installing build dependencies ]"
set -ex
cd "${BUILDDIR}/${ICINGA_BUILD_PROJECT}"
if command -v aptitude >/dev/null && [ -x /usr/lib/pbuilder/pbuilder-satisfydepends-aptitude ]; then
sudo $eatmydata /usr/lib/pbuilder/pbuilder-satisfydepends-aptitude
sudo $eatmydata DEBIAN_FRONTEND=noninteractive /usr/lib/pbuilder/pbuilder-satisfydepends-aptitude
else
sudo $eatmydata /usr/lib/pbuilder/pbuilder-satisfydepends
sudo $eatmydata DEBIAN_FRONTEND=noninteractive /usr/lib/pbuilder/pbuilder-satisfydepends
fi
)
......
......@@ -24,5 +24,5 @@ if [ -f "${WORKDIR}/testing/start_test.sh" ]; then
"${WORKDIR}/testing/start_test.sh"
else
echo "Falling back to pure package installation..."
sudo apt-get install -y "${ICINGA_BUILD_PROJECT}"
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y "${ICINGA_BUILD_PROJECT}"
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment