summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052023-09-09 09:47:45 +0800
committerzxp198210052023-09-09 09:47:45 +0800
commit410f8ee045c3a6c2f7490ea464c5396b264be51f (patch)
treedd8a5ca6d6d3958ae7292cf2d7637c8e8b879a97
parent27334579ee619fadbfb30f46579b7a7118614109 (diff)
downloadaur-410f8ee045c3a6c2f7490ea464c5396b264be51f.tar.gz
fix errors
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD23
-rw-r--r--eusoft-ting-en.sh2
3 files changed, 20 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index caf40077ee49..cf5df316dd91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
pkgbase = eusoft-ting-en-bin
pkgdesc = 听力统计、笔记同步、语音高亮跟随,让您轻松愉快学英语
pkgver = 9.6.2.114
- pkgrel = 1
+ pkgrel = 2
url = http://dict.eudic.net/ting
arch = x86_64
license = custom
- depends = hicolor-icon-theme
+ makedepends = asar
depends = bash
depends = electron13
+ depends = hicolor-icon-theme
conflicts = eusoft-ting-en
conflicts = eudic-ting_en
source = eusoft-ting-en-9.6.2.114.deb::https://static.frdic.com/pkg/ting_en/ting_en.deb
@@ -15,6 +16,6 @@ pkgbase = eusoft-ting-en-bin
source = eusoft-ting-en.sh
sha256sums = 47b4bd3aa25299fa835f7141e370aa679f938ce573a367418ad2d4ac2aa3a99c
sha256sums = 17651cf7ae49b0372b6b6812d8b3b066203892c9fbe0b04b25efec0ab038c12b
- sha256sums = fd5f52fe0bf371c88644c112b935b607c9f7357d717e1fc835d258c0aa912d19
+ sha256sums = d45e14c72d6b0369e835f65435df5804334c50ea5d2d518244e0ca72fc09daaf
pkgname = eusoft-ting-en-bin
diff --git a/PKGBUILD b/PKGBUILD
index e00eb8420d4c..8999469a215f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,33 @@
# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
-pkgname=eusoft-ting-en-bin
_appname=ting_en
+pkgname="eusoft-${_appname//_/-}-bin"
+_zhname="每日英语听力"
pkgver=9.6.2.114
-pkgrel=1
+pkgrel=2
pkgdesc="听力统计、笔记同步、语音高亮跟随,让您轻松愉快学英语"
arch=('x86_64')
url="http://dict.eudic.net/ting"
license=('custom')
conflicts=("${pkgname%-bin}" "eudic-${_appname}")
-depends=('hicolor-icon-theme' 'bash' 'electron13')
+depends=('bash' 'electron13' 'hicolor-icon-theme')
+makedepends=('asar')
source=("${pkgname%-bin}-${pkgver}.deb::https://static.frdic.com/pkg/${_appname}/${_appname}.deb"
"LICENSE.html"
"${pkgname%-bin}.sh")
sha256sums=('47b4bd3aa25299fa835f7141e370aa679f938ce573a367418ad2d4ac2aa3a99c'
'17651cf7ae49b0372b6b6812d8b3b066203892c9fbe0b04b25efec0ab038c12b'
- 'fd5f52fe0bf371c88644c112b935b607c9f7357d717e1fc835d258c0aa912d19')
-package() {
+ 'd45e14c72d6b0369e835f65435df5804334c50ea5d2d518244e0ca72fc09daaf')
+prepare() {
bsdtar -xf "${srcdir}/data.tar.xz"
- install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}"
- cp -r "${srcdir}/opt/每日英语听力/resources/"* "${pkgdir}/opt/${pkgname%-bin}"
- sed "s|\"/opt/每日英语听力/${_appname}\" %U|/opt/${pkgname%-bin}/${pkgname%-bin}|g;s|Icon=${_appname}|Icon=${pkgname%-bin}|g" \
+ asar e "${srcdir}/opt/${_zhname}/resources/app.asar" "${srcdir}/app.asar.unpacked"
+ cp -r "${srcdir}/opt/${_zhname}/resources/app.asar.unpacked" "${srcdir}"
+ asar p "${srcdir}/app.asar.unpacked" "${srcdir}/${pkgname%-bin}.asar"
+ sed "s|\"/opt/${_zhname}/${_appname}\" %U|${pkgname%-bin}|g;s|Icon=${_appname}|Icon=${pkgname%-bin}|g" \
-i "${srcdir}/usr/share/applications/${_appname}.desktop"
+}
+package() {
+ install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
+ install -Dm644 "${srcdir}/${pkgname%-bin}.asar" -t "${pkgdir}/opt/${pkgname%-bin}"
install -Dm644 "${srcdir}/usr/share/applications/${_appname}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
for _icons in 32x32 128x128 256x256;do
install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${_appname}.png" \
diff --git a/eusoft-ting-en.sh b/eusoft-ting-en.sh
index 883ad00bfc9a..97c7bd3aa552 100644
--- a/eusoft-ting-en.sh
+++ b/eusoft-ting-en.sh
@@ -1,6 +1,6 @@
#!/bin/bash
_ELECTRON=/usr/bin/electron13
-_ASAR="/opt/eusoft-ting-en/app.asar"
+_ASAR="/opt/eusoft-ting-en/eusoft-ting-en.asar"
if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
exec ${_ELECTRON} ${_ASAR} "$@"
else