diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2018-01-24 23:14:14 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-01-24 23:17:56 +0100 |
| commit | 403bc4dfc3b028c81b517b4553c14597e4e7cee3 (patch) | |
| tree | bba6350db3b01ef77552921d8ec7a00b19ccb6eb /main/dnsmasq | |
| parent | 6b179c1fa7fe08933c045f22f8a4e0e5ff771b2a (diff) | |
| download | aports-403bc4dfc3b028c81b517b4553c14597e4e7cee3.tar.bz2 aports-403bc4dfc3b028c81b517b4553c14597e4e7cee3.tar.xz | |
main/dnsmasq: remove explicit return 1
Diffstat (limited to 'main/dnsmasq')
| -rw-r--r-- | main/dnsmasq/APKBUILD | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD index 931c6bdf87..d9d7ee6935 100644 --- a/main/dnsmasq/APKBUILD +++ b/main/dnsmasq/APKBUILD @@ -32,8 +32,8 @@ builddir="$srcdir/$pkgname-$pkgver" build() { cd "$builddir" - make CFLAGS="$CFLAGS" COPTS="-DHAVE_DNSSEC" all || return 1 - mv src/dnsmasq src/dnsmasq~dnssec || return 1 + make CFLAGS="$CFLAGS" COPTS="-DHAVE_DNSSEC" all + mv src/dnsmasq src/dnsmasq~dnssec make CFLAGS="$CFLAGS" clean all } @@ -48,15 +48,12 @@ check() { package() { cd "$builddir" - make PREFIX=/usr DESTDIR="$pkgdir" install || return 1 + make PREFIX=/usr DESTDIR="$pkgdir" install - install -D -m755 "$srcdir"/$pkgname.initd \ - "$pkgdir"/etc/init.d/$pkgname || return 1 + install -D -m755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname - install -D -m644 "$srcdir"/$pkgname.confd \ - "$pkgdir"/etc/conf.d/$pkgname || return 1 - - install -m644 dnsmasq.conf.example "$pkgdir"/etc/dnsmasq.conf || return 1 + install -m644 dnsmasq.conf.example "$pkgdir"/etc/dnsmasq.conf install -d -m755 "$pkgdir"/etc/dnsmasq.d } @@ -66,10 +63,9 @@ dnssec() { cd "$builddir" - install -D -m 755 src/dnsmasq~dnssec \ - "$subpkgdir"/usr/sbin/dnsmasq || return 1 + install -D -m 755 src/dnsmasq~dnssec "$subpkgdir"/usr/sbin/dnsmasq install -D -m 644 trust-anchors.conf \ - "$subpkgdir"/usr/share/$pkgname/trust-anchors.conf || return 1 + "$subpkgdir"/usr/share/$pkgname/trust-anchors.conf cp -r "$pkgdir"/etc "$subpkgdir"/etc } |