fix errors

2 files changed, 17 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5cfa4b13d5a0..d563e038e3d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = notable-appimage
 	pkgdesc = The Markdown-based note-taking app that doesn't suck.
 	pkgver = 1.8.4
-	pkgrel = 3
+	pkgrel = 4
 	url = https://notable.app/
 	arch = x86_64
 	license = custom
@@ -9,7 +9,7 @@ pkgbase = notable-appimage
 	depends = zlib
 	depends = glibc
 	provides = notable
-	conflicts = notable-bin
+	conflicts = notable
 	options = !strip
 	source = notable-1.8.4.AppImage::https://github.com/notable/notable/releases/download/v1.8.4/Notable-1.8.4.AppImage
 	source = LICENSE::https://github.com/notable/notable/raw/master/SOURCE_CODE.md
diff --git a/PKGBUILD b/PKGBUILD
index a6494b032c02..66b0310fe5c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,33 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
-_pkgname=notable
-pkgname="${_pkgname}-appimage"
+pkgname="notable-appimage"
 pkgver=1.8.4
-pkgrel=3
+pkgrel=4
 pkgdesc="The Markdown-based note-taking app that doesn't suck."
 arch=("x86_64")
 url="https://notable.app/"
 _githuburl="https://github.com/notable/notable"
 license=('custom')
-depends=(hicolor-icon-theme zlib glibc)
+depends=('hicolor-icon-theme' 'zlib' 'glibc')
 options=(!strip)
-provides=("${_pkgname}")
-conflicts=("${_pkgname}-bin")
-install=
+provides=("${pkgname%-appimage}")
+conflicts=("${pkgname%-appimage}")
 _install_path="/opt/appimages"
-source=("${_pkgname}-${pkgver}.AppImage::${_githuburl}/releases/download/v${pkgver}/Notable-${pkgver}.AppImage"
+source=("${pkgname%-appimage}-${pkgver}.AppImage::${_githuburl}/releases/download/v${pkgver}/Notable-${pkgver}.AppImage"
     "LICENSE::${_githuburl}/raw/master/SOURCE_CODE.md")
 sha256sums=('7ee59f198613f35e8cdb21b73dc100cb1798201716ed9b108e5398a8f9477f67'
             '761159ffb2c4caef19adde130bebbffcc98e57aa98cde860a05d986f95e6ed4f')
 prepare() {
-    chmod a+x "${_pkgname}-${pkgver}.AppImage"
-    "./${_pkgname}-${pkgver}.AppImage" --appimage-extract > /dev/null
-    sed 's/Exec=/Exec=\/opt\/appimages\/notable.AppImage/g' -i "${srcdir}/squashfs-root/${_pkgname}.desktop"
+    chmod a+x "${pkgname%-appimage}-${pkgver}.AppImage"
+    "./${pkgname%-appimage}-${pkgver}.AppImage" --appimage-extract > /dev/null
+    sed 's|AppRun|/opt/appimages/notable.AppImage|g' -i "${srcdir}/squashfs-root/${pkgname%-appimage}.desktop"
 }
 
 package() {
-    install -Dm755 "${srcdir}/${_pkgname}-${pkgver}.AppImage" "${pkgdir}/${_install_path}/${_pkgname}.AppImage"
-    install -Dm644 "${srcdir}/squashfs-root/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+    install -Dm755 "${srcdir}/${pkgname%-appimage}-${pkgver}.AppImage" "${pkgdir}/${_install_path}/${pkgname%-appimage}.AppImage"
+    install -Dm644 "${srcdir}/squashfs-root/${pkgname%-appimage}.desktop" -t "${pkgdir}/usr/share/applications"
     for _icons in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024;do
-        install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icons}/apps/${_pkgname}.png" \
-            "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${_pkgname}.png"
+        install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-appimage}.png" \
+            -t "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps"
     done
-    install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
+    install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
\ No newline at end of file