More robust Debian dependency installation

We want it to complain loudly if a dependency is missing, not just
quietly continue on.

diff --git a/.github/containers/bionic/build.sh b/.github/containers/bionic/build.sh
index 243c3f95b3f4284adc2aaef009e078800ce3b844..32c844f7ede8185f6865fa9791c0d5dc910cc482 100755 (executable)
--- a/.github/containers/bionic/build.sh
+++ b/.github/containers/bionic/build.sh
@@ -47,10 +47,9 @@ docker run --volume ${CURDIR}/build:/home/deb/build --interactive --rm tigervnc/
        bash -e -x -c "
        tar -C ~/build -axf ~/build/tigervnc_${VERSION}.orig.tar.xz;
        cp -a ~/build/debian ~/build/tigervnc-${VERSION}/debian;
-       mk-build-deps ~/build/tigervnc-${VERSION}/debian/control;
-       sudo dpkg --unpack ~/tigervnc-build-deps_*.deb;
        sudo apt-get update;
-       sudo apt-get -f install -y;
+       mk-build-deps ~/build/tigervnc-${VERSION}/debian/control;
+       sudo apt-get install -y ~/tigervnc-build-deps_*.deb;
        cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage;
        "
 

diff --git a/.github/containers/focal/build.sh b/.github/containers/focal/build.sh
index 9041ca25da93e5d0e8b707637d2a0b39586c2695..90ff2c4de06c685c3e615ed9d4cf1636d7cd1e7c 100755 (executable)
--- a/.github/containers/focal/build.sh
+++ b/.github/containers/focal/build.sh
@@ -47,10 +47,9 @@ docker run --volume ${CURDIR}/build:/home/deb/build --interactive --rm tigervnc/
        bash -e -x -c "
        tar -C ~/build -axf ~/build/tigervnc_${VERSION}.orig.tar.xz;
        cp -a ~/build/debian ~/build/tigervnc-${VERSION}/debian;
-       mk-build-deps ~/build/tigervnc-${VERSION}/debian/control;
-       sudo dpkg --unpack ~/tigervnc-build-deps_*.deb;
        sudo apt-get update;
-       sudo apt-get -f install -y;
+       mk-build-deps ~/build/tigervnc-${VERSION}/debian/control;
+       sudo apt-get install -y ~/tigervnc-build-deps_*.deb;
        cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage;
        "