Date: Thursday, September 23, 2021 @ 13:27:55 Author: tpowa Revision: 424603
remove msg from PKGBUILD Modified: wireless-regdb/trunk/PKGBUILD ----------+ PKGBUILD | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-09-23 13:27:54 UTC (rev 424602) +++ PKGBUILD 2021-09-23 13:27:55 UTC (rev 424603) @@ -19,16 +19,12 @@ package() { # Install and verify regulatory.bin file - msg "Installing and verifying the regulatory.bin file ..." install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/regulatory.bin "${pkgdir}"/usr/lib/crda/regulatory.bin # This creates a depend/makedepend loop: # crda depends on wireless-regdb (but strictly doesn't makedepend on it) # wireless-regdb makedepends on crda - if /usr/bin/regdbdump "${pkgdir}"/usr/lib/crda/regulatory.bin > /dev/null; then - msg "Regulatory database verification was succesful." - else - error "Regulatory database verification failed." - return 1 + if ! /usr/bin/regdbdump "${pkgdir}"/usr/lib/crda/regulatory.bin > /dev/null; then + return 1 fi install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/sforshee.key.pub.pem "${pkgdir}"/usr/lib/crda/pubkeys/sforshee.key.pub.pem install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/wireless-regdb/LICENSE @@ -36,7 +32,6 @@ install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/regulatory.db "${pkgdir}"/usr/lib/firmware/regulatory.db install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/regulatory.db.p7s "${pkgdir}"/usr/lib/firmware/regulatory.db.p7s install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/regulatory.db.5 "${pkgdir}"/usr/share/man/man5/regulatory.db.5 - msg "Installing /etc/conf.d/wireless-regdom ..." install -D -m644 "${srcdir}"/crda.conf.d "${pkgdir}"/etc/conf.d/wireless-regdom for dom in $(grep ^country "${srcdir}"/${pkgname}-${pkgver}/db.txt | cut -d' ' -f2 | sed 's|:||g'); do echo "#WIRELESS_REGDOM=\"${dom}\"" >> "${pkgdir}"/etc/conf.d/wireless-regdom.tmp