summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD13
-rw-r--r--eusoft-ting-es.sh22
3 files changed, 25 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8a2eabf3a17e..c4e87e91836d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = eusoft-ting-es-bin
pkgdesc = 听力统计、笔记同步、语音高亮跟随,让您轻松愉快学西班牙语
pkgver = 9.7.0
- pkgrel = 1
+ pkgrel = 2
url = https://www.esdict.cn/ting
arch = x86_64
license = custom
@@ -15,6 +15,6 @@ pkgbase = eusoft-ting-es-bin
source = eusoft-ting-es.sh
sha256sums = 73e57df6718460a282ec4bd3d6aea59f78d6097b829b8516f8ab7075e81e981f
sha256sums = bb199c3faf0e1155a5bc43512e1898e6604034a67d9e2f4d16840b3b359cc432
- sha256sums = f3c45d6d7cbc7c9ce6dd019ce75a62b82597f49174c54977f12a3f5764c4b881
+ sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
pkgname = eusoft-ting-es-bin
diff --git a/PKGBUILD b/PKGBUILD
index a56ef853cd89..4229d54c61b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,8 @@ _appname=ting_es
pkgname="eusoft-${_appname//_/-}-bin"
_zhname="每日西语听力"
pkgver=9.7.0
-pkgrel=1
+_electronversion=13
+pkgrel=2
pkgdesc="听力统计、笔记同步、语音高亮跟随,让您轻松愉快学西班牙语"
arch=('x86_64')
url="https://www.esdict.cn/ting"
@@ -15,7 +16,7 @@ conflicts=(
)
depends=(
'hicolor-icon-theme'
- 'electron13'
+ "electron${_electronversion}"
)
source=(
"${pkgname%-bin}-${pkgver}.deb::https://static.frdic.com/pkg/${_appname}/${_appname}.deb"
@@ -24,10 +25,14 @@ source=(
)
sha256sums=('73e57df6718460a282ec4bd3d6aea59f78d6097b829b8516f8ab7075e81e981f'
'bb199c3faf0e1155a5bc43512e1898e6604034a67d9e2f4d16840b3b359cc432'
- 'f3c45d6d7cbc7c9ce6dd019ce75a62b82597f49174c54977f12a3f5764c4b881')
+ '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf')
build() {
+ sed -e "s|@electronversion@|${_electronversion}|g" \
+ -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" \
+ sed "s|\"/opt/${_zhname}/${_appname}\"|${pkgname%-bin}|g;s|Icon=${_appname}|Icon=${pkgname%-bin}|g" \
-i "${srcdir}/usr/share/applications/${_appname}.desktop"
}
package() {
diff --git a/eusoft-ting-es.sh b/eusoft-ting-es.sh
index 84388447f096..c77c53567639 100644
--- a/eusoft-ting-es.sh
+++ b/eusoft-ting-es.sh
@@ -1,11 +1,17 @@
-#!/bin/bash
-_ELECTRON=/usr/bin/electron13
-APPDIR="/usr/lib/eusoft-ting-es"
-export PATH="${APPDIR}:${PATH}"
-export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
-_ASAR="${APPDIR}/app.asar"
+#!/bin/sh
+set -e
+_APPDIR="/usr/lib/@appname@"
+_ASAR="${_APPDIR}/@appasar@"
+export PATH="${_APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+export ELECTRON_IS_DEV=0
+export NODE_ENV=production
if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
- exec ${_ELECTRON} ${_ASAR} "$@"
+ cd "${_APPDIR}"
+ exec electron@electronversion@ "${_ASAR}" "$@"
+ exit
else
- exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+ cd "${_APPDIR}"
+ exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
+ exit
fi \ No newline at end of file