main/btrfs-progs: improve abuild

1 files changed, 13 insertions, 12 deletions

diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index 4e7c4106f9..9193ee2aeb 100644
--- a/main/btrfs-progs/APKBUILD
+++ b/main/btrfs-progs/APKBUILD
@@ -12,15 +12,13 @@ depends=""
 makedepends="util-linux-dev bash attr-dev acl-dev e2fsprogs-dev zlib-dev
         lzo-dev asciidoc xmlto linux-headers
         autoconf automake libtool"
-install=
 subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:completion:noarch
         $pkgname-libs $pkgname-extra"
 source="https://www.kernel.org/pub/linux/kernel/people/kdave/$pkgname/$pkgname-v$pkgver.tar.xz
         includes.patch
-        musl-compat.patch
-        "
+        musl-compat.patch"
+builddir="$srcdir/$pkgname-v$pkgver"
 
-builddir="$srcdir"/$pkgname-v$pkgver
 prepare() {
         default_prepare || return 1
 
@@ -44,28 +42,31 @@ build() {
 
 package() {
         cd "$builddir"
+
         make -j1 DESTDIR="$pkgdir" install || return 1
+
         mkdir "$pkgdir"/sbin
-        for i in btrfs btrfsck fsck.btrfs mkfs.btrfs; do
-                mv "$pkgdir"/usr/bin/$i "$pkgdir"/sbin
+        local i; for i in btrfs btrfsck fsck.btrfs mkfs.btrfs; do
+                mv "$pkgdir"/usr/bin/$i "$pkgdir"/sbin/ || return 1
         done
         mv "$pkgdir"/usr/bin "$pkgdir"/usr/sbin
 }
 
 completion() {
-        pkgdesc="Bash completion script for $pkgname"
-        install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
+        pkgdesc="Bash completion script for $pkgname"
+        install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
 
-        install -Dm644 "$builddir"/btrfs-completion \
-                "$subpkgdir"/usr/share/bash-completion/completions/btrfs
+        install -Dm644 "$builddir"/btrfs-completion \
+                "$subpkgdir"/usr/share/bash-completion/completions/btrfs
 }
 
 extra() {
         depends="$pkgname"
         pkgdesc="BTRFS filesystem extra utilities"
+
         mkdir -p "$subpkgdir"
-        mv "$pkgdir"/usr "$subpkgdir"
-        rmdir "$subpkgdir"/usr/lib || return 1
+        mv "$pkgdir"/usr "$subpkgdir"/ || return 1
+        rmdir "$subpkgdir"/usr/lib
 }
 
 md5sums="b2dc5175a721247d982be6d98e1e7525  btrfs-progs-v4.7.3.tar.xz