fix errors

3 files changed, 20 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49dc92819da5..3f2c2f61ea37 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,6 +16,6 @@ pkgbase = eusoft-ting-fr-bin
 	source = eusoft-ting-fr.sh
 	sha256sums = efbf72d55838f72fe4992330092473416476bb32ab6a0d03135aff64f99e74c9
 	sha256sums = 69031e95591a339c4cd9c01547494e23196cea6438608f1f951b493ea8fca54f
-	sha256sums = 910f1727b3603b7e2f25033c0a9e071422a94918a8d8a63fc93522b2fabb6eef
+	sha256sums = e8d0746782caa1f803972282a041bc8406bd16a54628d74f391b260224f7665b
 
 pkgname = eusoft-ting-fr-bin
diff --git a/PKGBUILD b/PKGBUILD
index 2676be70fe96..6735ec7d4821 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,35 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
-pkgname=eusoft-ting-fr-bin
-_appname=ting_fr
+_pkgname=ting_fr
+pkgname="eusoft-${_pkgname//_/-}-bin"
+_zhsname="每日法语听力"
 pkgver=9.6.2.114
 pkgrel=1
 pkgdesc="听力统计、笔记同步、语音高亮跟随，让您轻松愉快学法语"
 arch=('x86_64')
 url="https://www.frdic.com/ting"
 license=('custom')
-conflicts=("${pkgname%-bin}" "eudic-${_appname}" "${_appname}")
+conflicts=("${pkgname%-bin}" "eudic-${_pkgname}" "${_pkgname}")
 depends=('hicolor-icon-theme' 'bash' 'electron13')
-source=("${pkgname%-bin}-${pkgver}.deb::https://static.frdic.com/pkg/${_appname}/${_appname}.deb"
+source=("${pkgname%-bin}-${pkgver}.deb::https://static.frdic.com/pkg/${_pkgname}/${_pkgname}.deb"
     "LICENSE.html"
     "${pkgname%-bin}.sh")
 sha256sums=('efbf72d55838f72fe4992330092473416476bb32ab6a0d03135aff64f99e74c9'
             '69031e95591a339c4cd9c01547494e23196cea6438608f1f951b493ea8fca54f'
-            '910f1727b3603b7e2f25033c0a9e071422a94918a8d8a63fc93522b2fabb6eef')
-package() {
+            'e8d0746782caa1f803972282a041bc8406bd16a54628d74f391b260224f7665b')
+prepare() {
     bsdtar -xf "${srcdir}/data.tar.xz"
-    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}"
-    cp -r "${srcdir}/opt/每日法语听力/resources/"* "${pkgdir}/opt/${pkgname%-bin}"
-    sed "s|\"/opt/每日法语听力/${_appname}\" %U|/opt/${pkgname%-bin}/${pkgname%-bin}|g;s|Icon=${_appname}|Icon=${pkgname%-bin}|g" \
-        -i "${srcdir}/usr/share/applications/${_appname}.desktop"
-    install -Dm644 "${srcdir}/usr/share/applications/${_appname}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    asar e "${srcdir}/opt/${_zhsname}/resources/app.asar" "${srcdir}/app.asar.unpacked"
+    cp -r "${srcdir}/opt/${_zhsname}/resources/app.asar.unpacked" "${srcdir}"
+    asar p "${srcdir}/app.asar.unpacked" "${srcdir}/${pkgname%-bin}.asar"
+    sed "s|\"/opt/${_zhsname}/${_pkgname}\" %U|${pkgname%-bin}|g;s|Icon=${_pkgname}|Icon=${pkgname%-bin}|g" \
+        -i "${srcdir}/usr/share/applications/${_pkgname}.desktop"
+}
+package() {
+    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/${pkgname%-bin}.asar" -t "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/usr/share/applications/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
     for _icons in 32x32 128x128 256x256;do
-        install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${_appname}.png" \
+        install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${_pkgname}.png" \
             "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png"
     done
     install -Dm644 "${srcdir}/LICENSE.html" -t "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/eusoft-ting-fr.sh b/eusoft-ting-fr.sh
index a8380bbcee9b..e11f0cfdaaae 100644
--- a/eusoft-ting-fr.sh
+++ b/eusoft-ting-fr.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron13
-_ASAR="/opt/eusoft-ting-fr/app.asar"
+_ASAR="/opt/eusoft-ting-fr/eusoft-ting-fr.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else