fix errors

2 files changed, 16 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c60080eda412..234a641682a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,14 +5,13 @@ pkgbase = eudic-appimage
 	url = https://www.eudic.net/v4/en/app/eudic
 	arch = x86_64
 	license = custom
-	depends = hicolor-icon-theme
 	depends = zlib
 	depends = glibc
 	conflicts = eudic
 	options = !strip
-	source = eudic-12.7.1.AppImage::https://static-main.frdic.com/pkg/eudic.AppImage?v=2023-03-16
+	source = eudic-12.7.1.AppImage::https://static-main.frdic.com/pkg/eudic.AppImage?v=2023-04-12
 	source = LICENSE::https://www.eudic.net/v4/home/privacy
 	sha256sums = 7fb7d6dabc1faf46d7c09cb428d7728ad88372bbb690a48b4a140884e787ba1a
-	sha256sums = 5fe3c67d822233995d9694b42fdd1b8c34507b4c70ba06931f7fbb66a2a11876
+	sha256sums = 3781d50b87b64059ea24d8e38b0a95888104eec2d1113b469d623ac87f232ffd
 
 pkgname = eudic-appimage
diff --git a/PKGBUILD b/PKGBUILD
index 51dd461176e0..9a19770d5a91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,5 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
-_pkgname=eudic
-pkgname="${_pkgname}-appimage"
+pkgname="eudic-appimage"
 pkgver=12.7.1
 pkgrel=3
 pkgdesc="权威的英语词典软件,英语学习者必备的工具,支持学习笔记、生词本多平台同步,让你随时随地学英语."
@@ -8,22 +7,23 @@ arch=('x86_64')
 url="https://www.eudic.net/v4/en/app/eudic"
 license=('custom')
 options=(!strip)
-conflicts=("${_pkgname}")
-providers=("${_pkgname}")
-depends=(hicolor-icon-theme zlib glibc)
+conflicts=("${pkgname%-appimage}")
+providers=("${pkgname%-appimage}")
+depends=('zlib' 'glibc')
 _install_path="/opt/appimages"
-source=("${_pkgname}-${pkgver}.AppImage::https://static-main.frdic.com/pkg/${_pkgname}.AppImage?v=2023-03-16"
+options=(!strip)
+source=("${pkgname%-appimage}-${pkgver}.AppImage::https://static-main.frdic.com/pkg/${pkgname%-appimage}.AppImage?v=2023-04-12"
     "LICENSE::https://www.eudic.net/v4/home/privacy")
 sha256sums=('7fb7d6dabc1faf46d7c09cb428d7728ad88372bbb690a48b4a140884e787ba1a'
-            '5fe3c67d822233995d9694b42fdd1b8c34507b4c70ba06931f7fbb66a2a11876')
+            '3781d50b87b64059ea24d8e38b0a95888104eec2d1113b469d623ac87f232ffd')
 prepare() {
-    chmod a+x "${_pkgname}-${pkgver}.AppImage"
-    "./${_pkgname}-${pkgver}.AppImage" --appimage-extract > /dev/null
-    sed 's/Exec=/Exec=\/opt\/appimages\/eudic.AppImage/g;s/Icon=ecom.eusoft.eudic/Icon=eudic/g' -i "${srcdir}/squashfs-root/default.desktop"
+    chmod a+x "${pkgname%-appimage}-${pkgver}.AppImage"
+    "./${pkgname%-appimage}-${pkgver}.AppImage" --appimage-extract > /dev/null
+    sed 's|Exec=/usr/share/eudic/AppRun|Exec=/opt/appimages/eudic.AppImage|g;s|Icon=ecom.eusoft.eudic|Icon=eudic|g' -i "${srcdir}/squashfs-root/default.desktop"
 }
 package() {
-    install -Dm755 "${srcdir}/${_pkgname}-${pkgver}.AppImage" "${pkgdir}/${_install_path}/${_pkgname}.AppImage"
-    install -Dm644 "${srcdir}/squashfs-root/com.eusoft.eudic.png" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.png"
-    install -Dm644 "${srcdir}/squashfs-root/default.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-    install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm755 "${srcdir}/${pkgname%-appimage}-${pkgver}.AppImage" "${pkgdir}/${_install_path}/${pkgname%-appimage}.AppImage"
+    install -Dm644 "${srcdir}/squashfs-root/com.eusoft.eudic.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-appimage}.png"
+    install -Dm644 "${srcdir}/squashfs-root/default.desktop" "${pkgdir}/usr/share/applications/${pkgname%-appimage}.desktop"
+    install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file