fix errors

2 files changed, 13 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 743be3ca4bb7..8b92cb5872ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 pkgbase = heimer-appimage
 	pkgdesc = A simple cross-platform mind map, diagram, and note-taking tool written in Qt.
 	pkgver = 4.1.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/juzzlin/Heimer
 	arch = x86_64
 	license = GPL3
-	depends = hicolor-icon-theme
 	depends = zlib
 	depends = glibc
 	provides = juzzlin
diff --git a/PKGBUILD b/PKGBUILD
index 537964c7586f..3739ad196bb1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,27 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
-_pkgname=heimer
-pkgname="${_pkgname}-appimage"
+pkgname="heimer-appimage"
 pkgver=4.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A simple cross-platform mind map, diagram, and note-taking tool written in Qt."
 arch=("x86_64")
 url="https://github.com/juzzlin/Heimer"
-license=(GPL3)
-depends=(hicolor-icon-theme zlib glibc)
+license=('GPL3')
+depends=('zlib' 'glibc')
 options=(!strip)
 provides=(juzzlin)
-conflicts=("${_pkgname}")
+conflicts=("${pkgname%-appimage}")
 _install_path="/opt/appimages"
-source=("${_pkgname}-${pkgver}.AppImage::${url}/releases/download/${pkgver}/Heimer-${pkgver}-x86_64.AppImage")
+source=("${pkgname%-appimage}-${pkgver}.AppImage::${url}/releases/download/${pkgver}/Heimer-${pkgver}-x86_64.AppImage")
 sha256sums=('067db4705747060f818f870d1ff79704d5b9ff49dad7b395780f88aff443c249')
     
 prepare() {
-    chmod a+x "${_pkgname}-${pkgver}.AppImage"
-    "./${_pkgname}-${pkgver}.AppImage" --appimage-extract > /dev/null
-    sed 's/Exec=heimer/Exec=\/opt\/appimages\/heimer.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|Exec=heimer|Exec=/opt/appimages/heimer.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 -Dm644 "${srcdir}/squashfs-root/${_pkgname}.png" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.png"
+    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"
+    install -Dm644 "${srcdir}/squashfs-root/${pkgname%-appimage}.png" -t "${pkgdir}/usr/share/pixmaps"
 }
\ No newline at end of file