fix errors

3 files changed, 16 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c46c973332a4..0b5ae8f03773 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = eusoft-ting-es-bin
 	pkgdesc = 听力统计、笔记同步、语音高亮跟随，让您轻松愉快学西班牙语
 	pkgver = 9.7.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.esdict.cn/ting
 	arch = x86_64
 	license = LicenseRef-custom
 	depends = hicolor-icon-theme
-	depends = electron13
+	depends = electron11-bin
 	conflicts = eusoft-ting-es
 	conflicts = eudic-ting-es
 	conflicts = ting-es
@@ -14,7 +14,7 @@ pkgbase = eusoft-ting-es-bin
 	source = LICENSE.html
 	source = eusoft-ting-es.sh
 	sha256sums = 73e57df6718460a282ec4bd3d6aea59f78d6097b829b8516f8ab7075e81e981f
-	sha256sums = bb199c3faf0e1155a5bc43512e1898e6604034a67d9e2f4d16840b3b359cc432
-	sha256sums = 1d3f21d54a2d9d1a53661bd91c2afd00df79b0ce4057a66b4c953febfc464cd8
+	sha256sums = 12ec1b3e4be99eee9c2d5fb55c196d2294c1b112e137927c61f81efb0e308f75
+	sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe
 
 pkgname = eusoft-ting-es-bin
diff --git a/PKGBUILD b/PKGBUILD
index c19031f2d2f9..56105d11f07b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@ _appname=ting_es
 pkgname="eusoft-${_appname//_/-}-bin"
 _zhname="每日西语听力"
 pkgver=9.7.0
-_electronversion=13
-pkgrel=3
+_electronversion=11
+pkgrel=4
 pkgdesc="听力统计、笔记同步、语音高亮跟随，让您轻松愉快学西班牙语"
 arch=('x86_64')
 url="https://www.esdict.cn/ting"
@@ -16,7 +16,7 @@ conflicts=(
 )
 depends=(
     'hicolor-icon-theme'
-    "electron${_electronversion}"
+    "electron${_electronversion}-bin"
 )
 source=(
     "${pkgname%-bin}-${pkgver}.deb::https://static.frdic.com/pkg/${_appname}/${_appname}.deb"
@@ -24,14 +24,14 @@ source=(
     "${pkgname%-bin}.sh"
 )
 sha256sums=('73e57df6718460a282ec4bd3d6aea59f78d6097b829b8516f8ab7075e81e981f'
-            'bb199c3faf0e1155a5bc43512e1898e6604034a67d9e2f4d16840b3b359cc432'
-            '1d3f21d54a2d9d1a53661bd91c2afd00df79b0ce4057a66b4c953febfc464cd8')
+            '12ec1b3e4be99eee9c2d5fb55c196d2294c1b112e137927c61f81efb0e308f75'
+            '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|g" \
         -e "s|@appname@|${pkgname%-bin}|g" \
-        -e "s|@appasar@|app.asar|g" \
+        -e "s|@runname@|app.asar|g" \
         -i "${srcdir}/${pkgname%-bin}.sh"
-    bsdtar -xf "${srcdir}/data.tar.xz"
+    bsdtar -xf "${srcdir}/data."*
     sed "s|\"/opt/${_zhname}/${_appname}\"|${pkgname%-bin}|g;s|Icon=${_appname}|Icon=${pkgname%-bin}|g" \
         -i "${srcdir}/usr/share/applications/${_appname}.desktop"
 }
diff --git a/eusoft-ting-es.sh b/eusoft-ting-es.sh
index 0d20cddc70ca..86cb3dc6a9bf 100644
--- a/eusoft-ting-es.sh
+++ b/eusoft-ting-es.sh
@@ -1,14 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 _APPDIR="/usr/lib/@appname@"
-_ASAR="${_APPDIR}/@appasar@"
+_RUNNAME="${_APPDIR}/@runname@"
 export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 export ELECTRON_IS_DEV=0
+export ELECTRON_FORCE_IS_PACKAGED=true
 export NODE_ENV=production
 cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_ASAR}" "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
 fi
\ No newline at end of file