fix errors

2 files changed, 16 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d22b3617661..f01f456239e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = yana-appimage
 	pkgdesc = Powerful note-taking app with nested documents, full-text search, rich-text editor, code snippet editor and more
 	pkgver = 1.0.16
-	pkgrel = 1
+	pkgrel = 2
 	url = https://yana.js.org/
 	arch = x86_64
 	license = MIT
@@ -9,7 +9,7 @@ pkgbase = yana-appimage
 	depends = zlib
 	depends = glibc
 	provides = yana
-	conflicts = yana-bin
+	conflicts = yana
 	options = !strip
 	source = yana-1.0.16.AppImage::https://github.com/lukasbach/yana/releases/download/v1.0.16/Yana-1.0.16.AppImage
 	source = LICENSE::https://github.com/lukasbach/yana/raw/master/LICENSE
diff --git a/PKGBUILD b/PKGBUILD
index d005a4ef3215..54c13c9f62fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,33 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
-_pkgname=yana
-pkgname="${_pkgname}-appimage"
+pkgname="yana-appimage"
 pkgver=1.0.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Powerful note-taking app with nested documents, full-text search, rich-text editor, code snippet editor and more"
 arch=("x86_64")
 url="https://yana.js.org/"
 _githuburl="https://github.com/lukasbach/yana"
-license=(MIT)
+license=('MIT')
 depends=('hicolor-icon-theme' 'zlib' 'glibc')
 options=(!strip)
-provides=("${_pkgname}")
-conflicts=("${_pkgname}-bin")
+provides=("${pkgname%-appimage}")
+conflicts=("${pkgname%-appimage}")
 _install_path="/opt/appimages"
-source=("${_pkgname}-${pkgver}.AppImage::${_githuburl}/releases/download/v${pkgver}/Yana-${pkgver}.AppImage"
+source=("${pkgname%-appimage}-${pkgver}.AppImage::${_githuburl}/releases/download/v${pkgver}/Yana-${pkgver}.AppImage"
     "LICENSE::${_githuburl}/raw/master/LICENSE")
 sha256sums=('4ea613222707524b0c93b7620bec578da8ec77cb18a52dd98afc81edf6f38083'
             'ebb422a6231ddde433e1d601377c455aefcc96cdc27662bd3ce07d08f1110152')
       
 prepare() {
-    chmod a+x "${_pkgname}-${pkgver}.AppImage"
-    "./${_pkgname}-${pkgver}.AppImage" --appimage-extract > /dev/null
-    sed 's/AppRun/\/opt\/appimages\/yana.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/yana.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; 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" \
+        "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-appimage}.png"
     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