fix errors

3 files changed, 18 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 02c6a62ef2fb..72ce3b79373f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = eusoft-ting-en-bin
 	pkgdesc = 听力统计、笔记同步、语音高亮跟随，让您轻松愉快学英语
 	pkgver = 9.7.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://dict.eudic.net/ting
 	arch = x86_64
-	license = custom
-	depends = electron13
+	license = LicenseRef-custom
+	depends = electron11
 	depends = hicolor-icon-theme
 	conflicts = eusoft-ting-en
 	conflicts = eudic-ting_en
@@ -14,6 +14,6 @@ pkgbase = eusoft-ting-en-bin
 	source = eusoft-ting-en.sh
 	sha256sums = 47b4bd3aa25299fa835f7141e370aa679f938ce573a367418ad2d4ac2aa3a99c
 	sha256sums = 17651cf7ae49b0372b6b6812d8b3b066203892c9fbe0b04b25efec0ab038c12b
-	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
 
 pkgname = eusoft-ting-en-bin
diff --git a/PKGBUILD b/PKGBUILD
index 4d7d5b225f40..790ba9e5a496 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,16 @@ _appname=ting_en
 pkgname="eusoft-${_appname//_/-}-bin"
 _zhname="每日英语听力"
 pkgver=9.7.0
-_electronversion=13
-pkgrel=3
+_electronversion=11
+pkgrel=4
 pkgdesc="听力统计、笔记同步、语音高亮跟随，让您轻松愉快学英语"
 arch=('x86_64')
 url="http://dict.eudic.net/ting"
-license=('custom')
-conflicts=("${pkgname%-bin}" "eudic-${_appname}")
+license=('LicenseRef-custom')
+conflicts=(
+    "${pkgname%-bin}"
+    "eudic-${_appname}"
+)
 depends=(
     "electron${_electronversion}"
     'hicolor-icon-theme'
@@ -21,13 +24,13 @@ source=(
 )
 sha256sums=('47b4bd3aa25299fa835f7141e370aa679f938ce573a367418ad2d4ac2aa3a99c'
             '17651cf7ae49b0372b6b6812d8b3b066203892c9fbe0b04b25efec0ab038c12b'
-            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -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-en.sh b/eusoft-ting-en.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/eusoft-ting-en.sh
+++ b/eusoft-ting-en.sh
@@ -1,15 +1,14 @@
 #!/bin/sh
 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 NODE_ENV=production
 cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_ASAR}" "$@"
+    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
-exit
\ No newline at end of file
+    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi
\ No newline at end of file