fix errors

3 files changed, 32 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 190d35fefa76..17cc60f6f04b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = eusoft-ting-en-bin
 	pkgdesc = 听力统计、笔记同步、语音高亮跟随，让您轻松愉快学英语
-	pkgver = 9.7.0
-	pkgrel = 5
+	pkgver = 9.7.4
+	pkgrel = 6
 	url = http://dict.eudic.net/ting
 	arch = x86_64
 	license = LicenseRef-custom
-	depends = electron11-bin
+	depends = electron11
 	conflicts = eusoft-ting-en
 	conflicts = eudic-ting_en
-	source = eusoft-ting-en-9.7.0.deb::https://static.frdic.com/pkg/ting_en/ting_en.deb
+	source = eusoft-ting-en-9.7.4.deb::https://static.frdic.com/pkg/ting_en/ting_en.deb
 	source = LICENSE.html
 	source = eusoft-ting-en.sh
-	sha256sums = 47b4bd3aa25299fa835f7141e370aa679f938ce573a367418ad2d4ac2aa3a99c
+	sha256sums = 5806324c371d9115f7e7f46ead8816a3a2ba5e797403369cd40ae49111c4f5fc
 	sha256sums = 17651cf7ae49b0372b6b6812d8b3b066203892c9fbe0b04b25efec0ab038c12b
-	sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
+	sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051
 
 pkgname = eusoft-ting-en-bin
diff --git a/PKGBUILD b/PKGBUILD
index 5387104706d0..30e4435f72fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 _appname=ting_en
 pkgname="eusoft-${_appname//_/-}-bin"
 _zhname="每日英语听力"
-pkgver=9.7.0
+pkgver=9.7.4
 _electronversion=11
-pkgrel=5
+pkgrel=6
 pkgdesc="听力统计、笔记同步、语音高亮跟随，让您轻松愉快学英语"
 arch=('x86_64')
 url="http://dict.eudic.net/ting"
@@ -14,20 +14,21 @@ conflicts=(
     "eudic-${_appname}"
 )
 depends=(
-    "electron${_electronversion}-bin"
+    "electron${_electronversion}"
 )
 source=(
     "${pkgname%-bin}-${pkgver}.deb::https://static.frdic.com/pkg/${_appname}/${_appname}.deb"
     "LICENSE.html"
     "${pkgname%-bin}.sh"
 )
-sha256sums=('47b4bd3aa25299fa835f7141e370aa679f938ce573a367418ad2d4ac2aa3a99c'
+sha256sums=('5806324c371d9115f7e7f46ead8816a3a2ba5e797403369cd40ae49111c4f5fc'
             '17651cf7ae49b0372b6b6812d8b3b066203892c9fbe0b04b25efec0ab038c12b'
-            'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
+            '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
         -e "s|@runname@|app.asar|g" \
+        -e "s|@cfgdirname@|${_appname}|g" \
         -e "s|@options@||g" \
         -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data."*
diff --git a/eusoft-ting-en.sh b/eusoft-ting-en.sh
index f9ced1432cfc..4cfe3ac09dd8 100644
--- a/eusoft-ting-en.sh
+++ b/eusoft-ting-en.sh
@@ -1,14 +1,29 @@
-#!/bin/sh
-set -e
+#!/bin/bash
+set -o pipefail
 _APPDIR="/usr/lib/@appname@"
 _RUNNAME="${_APPDIR}/@runname@"
+_CFGDIR="@cfgdirname@/"
+_OPTIONS="@options@"
 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 ELECTRON_DISABLE_SECURITY_WARNINGS=true
+export ELECTRON_OVERRIDE_DIST_PATH="/usr/bin/electron@electronversion@"
 export NODE_ENV=production
+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+export _FLAGS_FILE="${XDG_CONFIG_HOME}/${_CFGDIR}@appname@-flags.conf"
+declare -a _USER_FLAGS
+if [[ -f "${_FLAGS_FILE}" ]]; then
+    while read -r line; do
+        if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then
+            _USER_FLAGS+=("${line}")
+        fi
+    done < "${_FLAGS_FILE}"
+fi
 cd "${_APPDIR}"
-if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
+if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then
+    exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} "${_USER_FLAGS[@]}" "$@"
 else
-    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} --no-sandbox "${_USER_FLAGS[@]}" "$@"
 fi
\ No newline at end of file