From 8e511a8753b86095a8742d0baf9aae5c2cd912df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Mon, 12 Jun 2023 19:02:02 +0200 Subject: [PATCH] fix missing dpkg-sig --- assets/linux.Dockerfile | 2 +- assets/linux.build-deb.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/linux.Dockerfile b/assets/linux.Dockerfile index cbe751e..cffef1d 100644 --- a/assets/linux.Dockerfile +++ b/assets/linux.Dockerfile @@ -14,7 +14,7 @@ ENV TZ=Europe/Amsterdam # dependencies needed to run ./mach bootstrap -RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install python3 python3-dev python3-pip wget dpkg-sig ; true) +RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install python3 python3-dev python3-pip wget ; apt-get -y install dpkg-sig; true) RUN ( dnf -y upgrade && dnf -y install python3 python3-devel gcc wget rpm-build rpm-sign ; true) RUN ( zypper -n in mercurial python3 python3-pip python3-devel wget rpm-build ; true) diff --git a/assets/linux.build-deb.sh b/assets/linux.build-deb.sh index 84aeefc..c7add3f 100755 --- a/assets/linux.build-deb.sh +++ b/assets/linux.build-deb.sh @@ -47,8 +47,8 @@ cp -v ../librewolf.desktop usr/share/applications/librewolf.desktop cd .. dpkg-deb --build librewolf -# Sign the deb file if private key is provided -if [[ -f pk.asc ]]; then +# Sign the deb file if private key is provided and we have dpkg-sig available +if [[ -f pk.asc ]] && command -v dpkg-sig &>/dev/null; then gpg --import pk.asc dpkg-sig --sign builder librewolf.deb fi