summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-02-28 12:08:57 +0800
committerzxp198210052024-02-28 12:08:57 +0800
commit0b59eee29beb484e9eac899d551b3790afd3a60f (patch)
tree9c61e1b3869527f1c6950539dbf608778b95d7b1
parentd6a0fa1acbe4a74140a5c71127be921aa9390182 (diff)
downloadaur-0b59eee29beb484e9eac899d551b3790afd3a60f.tar.gz
fix errors
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
-rw-r--r--subtitler.sh9
3 files changed, 12 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9db1cd233e9c..f55d14473008 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
pkgbase = subtitler-bin
pkgdesc = Quickly download subtitles
pkgver = 1.5.5
- pkgrel = 7
+ pkgrel = 8
url = https://s8sachin.github.io/subtitler/
arch = x86_64
license = MIT
depends = hicolor-icon-theme
- depends = electron8
+ depends = electron8-bin
provides = subtitler=1.5.5
conflicts = subtitler
source = subtitler-1.5.5.AppImage::https://github.com/s8sachin/subtitler/releases/download/v1.5.5/subtitler_1.5.5_amd64.deb
@@ -14,6 +14,6 @@ pkgbase = subtitler-bin
source = subtitler.sh
sha256sums = ca37a8487fcf6283b36adcb43de9ebc4a12d7bd2ab96a73a1695f3c2b4d51f81
sha256sums = 61c4ef762e75d209db99b0ddd77c9931c1d966f19d72b5dc1f46e8041f18309c
- sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+ sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
pkgname = subtitler-bin
diff --git a/PKGBUILD b/PKGBUILD
index bc2da3eafcbe..6241487d080d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=subtitler-bin
_pkgname=Subtitler
pkgver=1.5.5
_electronversion=8
-pkgrel=7
+pkgrel=8
pkgdesc="Quickly download subtitles"
arch=("x86_64")
url="https://s8sachin.github.io/subtitler/"
@@ -13,7 +13,7 @@ provides=("${pkgname%-bin}=${pkgver}")
conflicts=("${pkgname%-bin}")
depends=(
'hicolor-icon-theme'
- "electron${_electronversion}"
+ "electron${_electronversion}-bin"
)
source=(
"${pkgname%-bin}-${pkgver}.AppImage::${_ghurl}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
@@ -22,13 +22,13 @@ source=(
)
sha256sums=('ca37a8487fcf6283b36adcb43de9ebc4a12d7bd2ab96a73a1695f3c2b4d51f81'
'61c4ef762e75d209db99b0ddd77c9931c1d966f19d72b5dc1f46e8041f18309c'
- 'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+ '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
build() {
sed -e "s|@electronversion@|${_electronversion}|" \
-e "s|@appname@|${pkgname%-bin}|g" \
- -e "s|@appasar@|app.asar|g" \
+ -e "s|@runname@|app.asar|g" \
-i "${srcdir}/${pkgname%-bin}.sh"
- bsdtar -xf "${srcdir}/data.tar.xz"
+ bsdtar -xf "${srcdir}/data."*
sed "s|/opt/${_pkgname}/${pkgname%-bin}|${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
}
package() {
diff --git a/subtitler.sh b/subtitler.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/subtitler.sh
+++ b/subtitler.sh
@@ -1,15 +1,14 @@
#!/bin/sh
set -e
_APPDIR="/usr/lib/@appname@"
-_ASAR="${_APPDIR}/@appasar@"
+_RUNNAME="${_APPDIR}/@runname@"
export PATH="${_APPDIR}:${PATH}"
export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
export ELECTRON_IS_DEV=0
export NODE_ENV=production
cd "${_APPDIR}"
if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
- exec electron@electronversion@ "${_ASAR}" "$@"
+ exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
else
- exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
-exit \ No newline at end of file
+ exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi \ No newline at end of file