Merge pull request #1 from marioortizmanero/master

New PKGBUILD with icons and desktop file

3 files changed, 30 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f71bca3f1e5..13f94715831b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = nault-bin
 	pkgdesc = Official Nault AppImage client
-	pkgver = 1.9.2
+	pkgver = 1.9.6
 	pkgrel = 1
 	url = https://github.com/Nault/Nault
-	install = nault-bin.install
 	arch = x86_64
 	license = MIT
 	depends = fuse2
@@ -11,8 +10,8 @@ pkgbase = nault-bin
 	conflicts = nault-bin
 	noextract = nault.AppImage
 	options = !strip
-	source = https://github.com/Nault/Nault/releases/download/v1.9.2/Nault-1.9.2-Linux.AppImage
-	sha512sums = 2114af9a2a3cc21004d4b96f17934112888d7b23263723411f30ec2c6ac2364d91194d5bd03c12141101f15bcff8329d0b512b57da8476782afc69b3a0a5c1a7
+	source = https://github.com/Nault/Nault/releases/download/v1.9.6/Nault-1.9.6-Linux.AppImage
+	sha512sums = 89c5a883dd573112da70fea45334755142d3dba2c5f89bf72a45adb2f9c3f56098e59518c209afb1b7ea0354dbfd99c50f3a32931f1845755d6587680f8312b2
 
 pkgname = nault-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 9731cfcd69a7..2ed823f91b98 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,41 @@
 # Maintainer: agilob <archlinux@agilob.net>
-pkgname=nault-bin
-pkgver=1.9.2
+# Maintainer: Mario Ortiz Manero <marioortizmanero@gmail.com>
+_pkgname=nault
+pkgname="${_pkgname}-bin"
+pkgver=1.9.6
 pkgrel=1
 pkgdesc='Official Nault AppImage client'
 arch=('x86_64')
 url='https://github.com/Nault/Nault'
 license=('MIT')
-provides=("${pkgname}")
+provides=("$pkgname")
 depends=('fuse2')
-conflicts=("${pkgname}")
+conflicts=("$pkgname")
 options=(!strip)
 _appimage="nault.AppImage"
-source=("https://github.com/Nault/Nault/releases/download/v${pkgver}/Nault-${pkgver}-Linux.AppImage")
-noextract=("${_appimage}")
-sha512sums=('2114af9a2a3cc21004d4b96f17934112888d7b23263723411f30ec2c6ac2364d91194d5bd03c12141101f15bcff8329d0b512b57da8476782afc69b3a0a5c1a7')
-install="${pkgname}.install"
+source=("${url}/releases/download/v${pkgver}/Nault-${pkgver}-Linux.AppImage")
+noextract=("$_appimage")
+sha512sums=('89c5a883dd573112da70fea45334755142d3dba2c5f89bf72a45adb2f9c3f56098e59518c209afb1b7ea0354dbfd99c50f3a32931f1845755d6587680f8312b2')
 
-# extracting icons doesnt work now, this is here for future purposes
-# prepare() {
-# 	bsdcpio --extract --make-directories --insecure 'nano-vault' '.DirIcon' 'usr/share/icons' < "${_appimage}"
-# }
+prepare() {
+    mv "Nault-${pkgver}-Linux.AppImage" "$_appimage"
+    chmod +x "$_appimage"
+    "./$_appimage" --appimage-extract
 
-# build() {
-# 	sed -i -E "s|Exec=AppRun|Exec=${_pkgname}|" nano-vault.desktop
-# 	chmod -R g-w,o-w usr/share/icons
-# }
+    # Fixing the desktop file
+    sed -i -E "s:Exec=AppRun:Exec=/opt/${_pkgname}/${_appimage}:" "squashfs-root/${_pkgname}.desktop"
+}
 
 package() {
-    mv "Nault-${pkgver}-Linux.AppImage" 'nault.AppImage'
-	install -Dpm755 "${_appimage}" "${pkgdir}/opt/${pkgname}/${_appimage}"
+    # Appimage and symlink
+    install -Dpm755 "${_appimage}" "${pkgdir}/opt/${_pkgname}/${_appimage}"
+    install -dm755 "${pkgdir}/usr/bin"
+    ln -s "/opt/${_pkgname}/${_appimage}" "${pkgdir}/usr/bin/${_pkgname}"
+
+    # Desktop file
+    install -Dm644 "${srcdir}/squashfs-root/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+
+    # Icons
+    install -dm755 "${pkgdir}/usr/share/"
+    cp -r --no-preserve=mode,ownership "${srcdir}/squashfs-root/usr/share/icons" "${pkgdir}/usr/share/"
 }
diff --git a/nault-bin.install b/nault-bin.install
deleted file mode 100644
index c3a85fef8c02..000000000000
--- a/nault-bin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	ln -sf '/opt/nault-bin/nault.AppImage' '/usr/bin/nault'
-}
-
-post_upgrade() {
-	post_install $1
-}
-
-post_remove() {
-	rm -f '/usr/bin/nault'
-}