polish PKGBUILD

3 files changed, 24 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d042e0dfb204..4e807a1ff178 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = wonderpen-appimage
 	pkgdesc = A professional writing software with markdown support
 	pkgver = 1.7.9
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.atominn.com/wonderpen
 	arch = x86_64
 	license = custom
-	noextract = WonderPen_linux_1.7.9(5225).AppImage
+	provides = wonderpen
+	conflicts = wonderpen
+	noextract = wonderpen.AppImage
 	options = !strip
-	source = https://file.atominn.com/WonderPen/1.7/WonderPen_linux_1.7.9(5225).AppImage
+	source = wonderpen.AppImage::https://file.atominn.com/WonderPen/1.7/WonderPen_linux_1.7.9(5225).AppImage
 	source = wonderpen.sh
 	sha256sums = a20905cb3e469e728c0fa985e724c62c7bbe0c21bdf8eb220521000381d29e87
-	sha256sums = 67e1c7313c3724e94d249054626ff1b58e67adad15ccbea5a9a4e67f501dd725
+	sha256sums = e9d4b90a89dad8de88c49346fff51e3813a7f1503ab3d058b87cf647d0946a10
 
 pkgname = wonderpen-appimage
 
diff --git a/PKGBUILD b/PKGBUILD
index 1693ebd56fe0..5f67622259bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,33 @@
 # Maintainer: ventusliberum <dafeinayius@gmail.com>
 
 pkgname=wonderpen-appimage
-_pkgname="WonderPen_linux_1.7.9(5225).AppImage"
+_pkgname=wonderpen
 pkgver=1.7.9
-pkgrel=1
+_pkgver=5225
+pkgrel=2
 pkgdesc="A professional writing software with markdown support"
 arch=("x86_64")
 url="https://www.atominn.com/wonderpen"
 license=(custom)
-noextract=(${_pkgname})
-options=("!strip")
-source=("https://file.atominn.com/WonderPen/1.7/WonderPen_linux_1.7.9(5225).AppImage"
-        "wonderpen.sh")
+provides=('wonderpen')
+conflicts=('wonderpen')
+options=(!strip)
+source=('wonderpen.AppImage'::"https://file.atominn.com/WonderPen/${pkgver%.*}/WonderPen_linux_${pkgver}(${_pkgver}).AppImage"
+        'wonderpen.sh')
 sha256sums=('a20905cb3e469e728c0fa985e724c62c7bbe0c21bdf8eb220521000381d29e87'
-            '67e1c7313c3724e94d249054626ff1b58e67adad15ccbea5a9a4e67f501dd725')
+            'e9d4b90a89dad8de88c49346fff51e3813a7f1503ab3d058b87cf647d0946a10')
+noextract=('wonderpen.AppImage')
 
 prepare() {
     cd "${srcdir}"
-    chmod a+x ${_pkgname}
-    ${srcdir}/${_pkgname} --appimage-extract
+    chmod +x ${_pkgname}.AppImage
+    ./${_pkgname}.AppImage --appimage-extract
+    sed -i "s,Exec=AppRun,Exec=/usr/bin/${_pkgname} %F,g" "squashfs-root/${_pkgname}.desktop"
 }
 
 package() {
-    cd ${srcdir}
-    install -Dm755 "${srcdir}/${_pkgname}" "$pkgdir/opt/appimage/wonderpen/wonderpen.AppImage"
-    install -Dm755 "${srcdir}/wonderpen.sh" "${pkgdir}/usr/bin/wonderpen"
-    install -Dm644 "${srcdir}/squashfs-root/wonderpen.desktop" "${pkgdir}/usr/share/applications/wonderpen.desktop"
-    install -Dm644 "${srcdir}/squashfs-root/wonderpen.png" "${pkgdir}/usr/share/icons/wonderpen.png"
-    sed -i 's|Exec=AppRun|Exec=wonderpen %F|g' "${pkgdir}/usr/share/applications/wonderpen.desktop"
+    install -Dm755 "${srcdir}/${_pkgname}.AppImage" "$pkgdir/opt/appimages/${_pkgname}.AppImage"
+    install -Dm755 "${srcdir}/${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}"
+    install -Dm644 "${srcdir}/squashfs-root/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+    install -Dm644 "${srcdir}/squashfs-root/${_pkgname}.png" "${pkgdir}/usr/share/icons/${_pkgname}.png"
 } 
diff --git a/wonderpen.sh b/wonderpen.sh
index a58cedec9e70..cfb9448efec9 100644
--- a/wonderpen.sh
+++ b/wonderpen.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-DESKTOPINTEGRATION=no /opt/appimage/wonderpen/wonderpen.AppImage "$@"
+DESKTOPINTEGRATION=no /opt/appimages/wonderpen.AppImage "$@"