Fix noextract array

2 files changed, 12 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2b7b5b3baf4..1455211d7e98 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,7 +9,10 @@ pkgbase = appimagetool-bin
 	license = MIT
 	depends = libappimage
 	provides = appimagetool
-	noextract = appimagetool
+	conflicts = appimagetool
+	noextract = appimagetool-12-x86_64.appimage
+	noextract = appimagetool-12-armv7.appimage
+	noextract = appimagetool-12-aarch64.appimage
 	source = appimagetool-12-README.md::https://github.com/AppImage/AppImageKit/raw/12/README.md
 	source = appimagetool-12-LICENSE::https://github.com/AppImage/AppImageKit/raw/12/LICENSE
 	sha256sums = e7396f995fed233e08063a5bec8f26c343d7f1038f0fca80c3cad26d74090255
diff --git a/PKGBUILD b/PKGBUILD
index 574e7216e52d..4391a616fcbf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,10 @@ url='https://github.com/AppImage/AppImageKit'
 license=('MIT')
 depends=('libappimage')
 provides=("${_pkgname}")
-noextract=("${_pkgname}")
+conflicts=("${_pkgname}")
+noextract=("${_pkgname}-${pkgver}-x86_64.appimage"
+          "${_pkgname}-${pkgver}-armv7.appimage"
+          "${_pkgname}-${pkgver}-aarch64.appimage")
 
 source=("${_pkgname}-${pkgver}-README.md::${url}/raw/${pkgver}/README.md"
         "${_pkgname}-${pkgver}-LICENSE::${url}/raw/${pkgver}/LICENSE")
@@ -30,10 +33,10 @@ prepare() {
 }
 
 package(){
-  install -Dm755 -t "${pkgdir}/usr/bin" "squashfs-root/usr/bin/${_pkgname}"
-  install -Dm755 -t "${pkgdir}/usr/lib/appimagekit" "squashfs-root/usr/lib/appimagekit/mksquashfs"
-  install -Dm644 "${_pkgname}-${pkgver}-README.md" "${pkgdir}/usr/share/doc/${_pkgname}/README.md"
-  install -Dm644 "${_pkgname}-${pkgver}-LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+  install -Dvm755 "squashfs-root/usr/bin/${_pkgname}" -t "${pkgdir}/usr/bin"
+  install -Dvm755 "squashfs-root/usr/lib/appimagekit/mksquashfs" -t "${pkgdir}/usr/lib/appimagekit"
+  install -Dvm644 "${_pkgname}-${pkgver}-README.md" "${pkgdir}/usr/share/doc/${_pkgname}/README.md"
+  install -Dvm644 "${_pkgname}-${pkgver}-LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
 
 # vim: ts=2 sw=2 et: