diff options
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 17 | ||||
-rw-r--r-- | eusoft-ting-fr.sh | 21 |
3 files changed, 33 insertions, 15 deletions
@@ -1,19 +1,19 @@ pkgbase = eusoft-ting-fr-bin pkgdesc = 听力统计、笔记同步、语音高亮跟随,让您轻松愉快学法语 pkgver = 9.7.0 - pkgrel = 5 + pkgrel = 6 url = https://www.frdic.com/ting arch = x86_64 license = LicenseRef-custom - depends = electron11-bin + depends = electron11 conflicts = eusoft-ting-fr conflicts = eudic-ting_fr conflicts = ting_fr source = eusoft-ting-fr-9.7.0.deb::https://static.frdic.com/pkg/ting_fr/ting_fr.deb source = LICENSE.html::https://www.eudic.net/v4/en/home/privacy source = eusoft-ting-fr.sh - sha256sums = efbf72d55838f72fe4992330092473416476bb32ab6a0d03135aff64f99e74c9 - sha256sums = 12ec1b3e4be99eee9c2d5fb55c196d2294c1b112e137927c61f81efb0e308f75 - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = cdf9d08b640518a101e875a9d2b5c4e92e32258c78f0e98017020031803a4a93 + sha256sums = 26a42e8de81b308e2dd5200f3d827b4dde3e443bf18e849dcc4d35a2acc173dc + sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 pkgname = eusoft-ting-fr-bin @@ -4,27 +4,32 @@ pkgname="eusoft-${_pkgname//_/-}-bin" _zhsname="每日法语听力" pkgver=9.7.0 _electronversion=11 -pkgrel=5 +pkgrel=6 pkgdesc="听力统计、笔记同步、语音高亮跟随,让您轻松愉快学法语" arch=('x86_64') url="https://www.frdic.com/ting" license=('LicenseRef-custom') -conflicts=("${pkgname%-bin}" "eudic-${_pkgname}" "${_pkgname}") +conflicts=( + "${pkgname%-bin}" + "eudic-${_pkgname}" + "${_pkgname}" +) depends=( - "electron${_electronversion}-bin" + "electron${_electronversion}" ) source=( "${pkgname%-bin}-${pkgver}.deb::https://static.frdic.com/pkg/${_pkgname}/${_pkgname}.deb" "LICENSE.html::https://www.eudic.net/v4/en/home/privacy" "${pkgname%-bin}.sh" ) -sha256sums=('efbf72d55838f72fe4992330092473416476bb32ab6a0d03135aff64f99e74c9' - '12ec1b3e4be99eee9c2d5fb55c196d2294c1b112e137927c61f81efb0e308f75' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') +sha256sums=('cdf9d08b640518a101e875a9d2b5c4e92e32258c78f0e98017020031803a4a93' + '26a42e8de81b308e2dd5200f3d827b4dde3e443bf18e849dcc4d35a2acc173dc' + '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') build() { sed -e "s|@electronversion@|${_electronversion}|g" \ -e "s|@appname@|${pkgname%-bin}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@cfgdirname@|${_pkgname}|g" \ -e "s|@options@||g" \ -i "${srcdir}/${pkgname%-bin}.sh" bsdtar -xf "${srcdir}/data."* diff --git a/eusoft-ting-fr.sh b/eusoft-ting-fr.sh index 7ddcaab8d734..4cfe3ac09dd8 100644 --- a/eusoft-ting-fr.sh +++ b/eusoft-ting-fr.sh @@ -1,16 +1,29 @@ #!/bin/bash -set -e +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}" "${_OPTIONS}" "$@" || exit $? +if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then + exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} "${_USER_FLAGS[@]}" "$@" else - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} --no-sandbox "${_USER_FLAGS[@]}" "$@" fi
\ No newline at end of file |