From: Peter van Dijk Date: Tue, 4 Feb 2025 12:00:28 +0000 (+0100) Subject: simplify if grep call X-Git-Tag: dnsdist-2.0.0-alpha1~52^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaf9bcab50e185124ccaad802f396a068e0c535e;p=thirdparty%2Fpdns.git simplify if grep call --- diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild index 84924499bb..d5233d2103 100644 --- a/builder-support/dockerfiles/Dockerfile.rpmbuild +++ b/builder-support/dockerfiles/Dockerfile.rpmbuild @@ -34,7 +34,7 @@ ADD builder-support/specs/ /pdns/builder-support/specs RUN find /pdns/builder-support/specs/ -not -name '*.spec' -exec ln -s {} /root/rpmbuild/SOURCES/ \; @IF [ -n "$M_authoritative$M_all" ] -RUN touch /var/lib/rpm/* && if $(grep -q 'release 8' /etc/redhat-release); then \ +RUN touch /var/lib/rpm/* && if grep -q 'release 8' /etc/redhat-release; then \ scl enable gcc-toolset-13 -- builder/helpers/build-specs.sh builder-support/specs/pdns.spec; \ else \ builder/helpers/build-specs.sh builder-support/specs/pdns.spec; \ @@ -42,7 +42,7 @@ RUN touch /var/lib/rpm/* && if $(grep -q 'release 8' /etc/redhat-release); then @ENDIF @IF [ -n "$M_recursor$M_all" ] -RUN touch /var/lib/rpm/* && if $(grep -q 'release 8' /etc/redhat-release); then \ +RUN touch /var/lib/rpm/* && if grep -q 'release 8' /etc/redhat-release; then \ scl enable gcc-toolset-13 -- builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec; \ else \ builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec; \ @@ -56,7 +56,7 @@ RUN touch /var/lib/rpm/* && mkdir /libh2o && cd /libh2o && \ cd /pdns/builder-support/helpers/ && \ ./install_h2o.sh -RUN touch /var/lib/rpm/* && if $(grep -q 'release 8' /etc/redhat-release); then \ +RUN touch /var/lib/rpm/* && if grep -q 'release 8' /etc/redhat-release; then \ scl enable gcc-toolset-13 -- builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \ else \ builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \