update to 2023.12.19

3 files changed, 30 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5d362ea99a7..f54bc6662a72 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = eusoft-frhelper-bin
 	pkgdesc = 法语助手,权威的法语词典软件,法语学习者必备的工具.支持学习笔记、生词本多平台同步，让你随时随地学法语.
-	pkgver = 2023_11_07
+	pkgver = 2023.12.19
 	pkgrel = 1
 	url = https://www.eudic.net/v4/fr/app/frhelper
 	arch = x86_64
@@ -62,9 +62,11 @@ pkgbase = eusoft-frhelper-bin
 	conflicts = eusoft-frhelper
 	conflicts = frhelper
 	options = !strip
-	source = eusoft-frhelper-2023_11_07.deb::https://www.eudic.net/download/frhelper.deb?v=2023-11-07
+	source = eusoft-frhelper-2023.12.19.deb::https://www.eudic.net/download/frhelper.deb?v=2023-12-19
 	source = LICENSE.html
-	sha256sums = a2e40c51cfbb0425de8cbcba44fbbed9ff282697346a3bd940fbf8278d030dfe
+	source = eusoft-frhelper.sh
+	sha256sums = ce5fcba8f0a2ffd0bff6b62e63f658883e795577caca130698de799a8647530c
 	sha256sums = 69031e95591a339c4cd9c01547494e23196cea6438608f1f951b493ea8fca54f
+	sha256sums = 1f086c1275263d7be3291f28b211da94187870f88e7437511aa6496ffb7fe99f
 
 pkgname = eusoft-frhelper-bin
diff --git a/PKGBUILD b/PKGBUILD
index 076c55900cc5..ee73f6281379 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,16 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 _pkgname=frhelper
 pkgname="eusoft-${_pkgname}-bin"
-pkgver=2023_11_07
+pkgver=2023.12.19
 pkgrel=1
 pkgdesc="法语助手,权威的法语词典软件,法语学习者必备的工具.支持学习笔记、生词本多平台同步，让你随时随地学法语."
 arch=('x86_64')
 url="https://www.eudic.net/v4/fr/app/frhelper"
 license=('custom')
-conflicts=("${pkgname%-bin}" "${_pkgname}")
+conflicts=(
+    "${pkgname%-bin}"
+    "${_pkgname}"
+)
 options=('!strip')
 depends=(
     'pango'
@@ -66,21 +69,25 @@ depends=(
     'openssl-1.0'
 )
 source=(
-    "${pkgname%-bin}-${pkgver}.deb::https://www.eudic.net/download/${_pkgname}.deb?v=${pkgver//_/-}"
+    "${pkgname%-bin}-${pkgver}.deb::https://www.eudic.net/download/${_pkgname}.deb?v=${pkgver//./-}"
     "LICENSE.html"
+    "${pkgname%-bin}.sh"
 )
-sha256sums=('a2e40c51cfbb0425de8cbcba44fbbed9ff282697346a3bd940fbf8278d030dfe'
-            '69031e95591a339c4cd9c01547494e23196cea6438608f1f951b493ea8fca54f')
+sha256sums=('ce5fcba8f0a2ffd0bff6b62e63f658883e795577caca130698de799a8647530c'
+            '69031e95591a339c4cd9c01547494e23196cea6438608f1f951b493ea8fca54f'
+            '1f086c1275263d7be3291f28b211da94187870f88e7437511aa6496ffb7fe99f')
 build() {
+    sed -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@appasar@|${_pkgname}|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data.tar.xz"
     sed "s|/usr/share/${pkgname%-bin}/AppRun|${pkgname%-bin}|g;s|com.eusoft.${_pkgname}|${pkgname%-bin}|g" \
         -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
-    sed "s|usr/share|opt|g" -i "${srcdir}/usr/share/${pkgname%-bin}/AppRun"
 }
 package() {
-    install -Dm755 -d "${pkgdir}/"{opt,usr/bin}
+    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    install -Dm755 -d "${pkgdir}/opt"
     cp -r "${srcdir}/usr/share/${pkgname%-bin}" "${pkgdir}/opt"
-    ln -sf "/opt/${pkgname%-bin}/AppRun" "${pkgdir}/usr/bin/${pkgname%-bin}"
     install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/usr/share/pixmaps/com.eusoft.${_pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
     install -Dm644 "${srcdir}/LICENSE.html" -t "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/eusoft-frhelper.sh b/eusoft-frhelper.sh
new file mode 100644
index 000000000000..20e88b7f284b
--- /dev/null
+++ b/eusoft-frhelper.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+_APPDIR="/opt/@appname@"
+_RUNNAME="${_APPDIR}/@runname@"
+export PATH="${_APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${_APPDIR}:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+export GST_PLUGIN_SYSTEM_PATH="${_APPDIR}/gstreamer-1.0:${GST_PLUGIN_SYSTEM_PATH}"
+export GST_PLUGIN_PATH="${_APPDIR}/gstreamer-1.0:${GST_PLUGIN_SYSTEM_PATH}"
+cd "${_APPDIR}"
+exec "${_RUNNAME}" "$@" || exit
\ No newline at end of file