fix errors

3 files changed, 23 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e043348c3a55..ccfdcc4cd611 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = eusoft-ting-en-bin
 	pkgdesc = 听力统计、笔记同步、语音高亮跟随，让您轻松愉快学英语
-	pkgver = 9.7.1
-	pkgrel = 1
+	pkgver = 9.7.0
+	pkgrel = 2
 	url = http://dict.eudic.net/ting
 	arch = x86_64
 	license = custom
-	depends = bash
 	depends = electron13
 	depends = hicolor-icon-theme
 	conflicts = eusoft-ting-en
 	conflicts = eudic-ting_en
-	source = eusoft-ting-en-9.7.1.deb::https://static.frdic.com/pkg/ting_en/ting_en.deb
+	source = eusoft-ting-en-9.7.0.deb::https://static.frdic.com/pkg/ting_en/ting_en.deb
 	source = LICENSE.html
 	source = eusoft-ting-en.sh
 	sha256sums = 47b4bd3aa25299fa835f7141e370aa679f938ce573a367418ad2d4ac2aa3a99c
 	sha256sums = 17651cf7ae49b0372b6b6812d8b3b066203892c9fbe0b04b25efec0ab038c12b
-	sha256sums = 7134a5a09adf082ce8f0e78cc658c705131e50667da2b6d20304fa11864aec1a
+	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
 
 pkgname = eusoft-ting-en-bin
diff --git a/PKGBUILD b/PKGBUILD
index 2f072e969ae8..fdd89ddb751f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,16 @@
 _appname=ting_en
 pkgname="eusoft-${_appname//_/-}-bin"
 _zhname="每日英语听力"
-pkgver=9.7.1
-pkgrel=1
+pkgver=9.7.0
+_electronversion=13
+pkgrel=2
 pkgdesc="听力统计、笔记同步、语音高亮跟随，让您轻松愉快学英语"
 arch=('x86_64')
 url="http://dict.eudic.net/ting"
 license=('custom')
 conflicts=("${pkgname%-bin}" "eudic-${_appname}")
 depends=(
-    'bash'
-    'electron13'
+    "electron${_electronversion}"
     'hicolor-icon-theme'
 )
 source=(
@@ -21,8 +21,12 @@ source=(
 )
 sha256sums=('47b4bd3aa25299fa835f7141e370aa679f938ce573a367418ad2d4ac2aa3a99c'
             '17651cf7ae49b0372b6b6812d8b3b066203892c9fbe0b04b25efec0ab038c12b'
-            '7134a5a09adf082ce8f0e78cc658c705131e50667da2b6d20304fa11864aec1a')
+            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@appasar@|app.asar|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data.tar.xz"
     sed "s|\"/opt/${_zhname}/${_appname}\" %U|${pkgname%-bin}|g;s|Icon=${_appname}|Icon=${pkgname%-bin}|g" \
         -i "${srcdir}/usr/share/applications/${_appname}.desktop"
diff --git a/eusoft-ting-en.sh b/eusoft-ting-en.sh
index e40d93ea9acf..2ec4412e5c4f 100644
--- a/eusoft-ting-en.sh
+++ b/eusoft-ting-en.sh
@@ -1,11 +1,14 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron13
-APPDIR="/usr/lib/eusoft-ting-en"
-export PATH="${APPDIR}:${PATH}"
-export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
-_ASAR="${APPDIR}/app.asar"
+set -e
+_APPDIR="/usr/lib/@appname@"
+export PATH="${_APPDIR}:${PATH}"
+export ELECTRON_IS_DEV=0
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${_APPDIR}/@appasar@"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
 fi
\ No newline at end of file