summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-03-01 13:16:32 +0800
committerzxp198210052024-03-01 13:16:32 +0800
commit01923e5debbd2c4c1a5a252874753214c3478e4c (patch)
treeb3b9ac84e1fbf233646bfeab7bc3fc3d0ca8e1c6
parent4141599b607a630d4864e1d0f6303ecbd007417f (diff)
downloadaur-01923e5debbd2c4c1a5a252874753214c3478e4c.tar.gz
fix errors
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--jlivertool.sh9
3 files changed, 10 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 085f548f3d12..2c8c543cd61a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = jlivertool-bin
pkgdesc = Bilibili 弹幕机
pkgver = 2.1.1
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/Xinrea/JLiverTool
arch = x86_64
license = MIT
@@ -14,6 +14,6 @@ pkgbase = jlivertool-bin
source = jlivertool.sh
sha256sums = e0db716a2ca6258d144bf5f03b3dd98862a8760286c2190f704dce4761b89479
sha256sums = 5d86e387ac33cf32eee9c968d38483a30567690b843c3768b35fe4bc55b455a8
- sha256sums = 1d3f21d54a2d9d1a53661bd91c2afd00df79b0ce4057a66b4c953febfc464cd8
+ sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe
pkgname = jlivertool-bin
diff --git a/PKGBUILD b/PKGBUILD
index 0470f29ed164..fb35097c8cbc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=jlivertool-bin
pkgver=2.1.1
_electronversion=26
-pkgrel=1
+pkgrel=2
pkgdesc="Bilibili 弹幕机"
arch=('x86_64')
url="https://github.com/Xinrea/JLiverTool"
@@ -20,11 +20,11 @@ source=(
)
sha256sums=('e0db716a2ca6258d144bf5f03b3dd98862a8760286c2190f704dce4761b89479'
'5d86e387ac33cf32eee9c968d38483a30567690b843c3768b35fe4bc55b455a8'
- '1d3f21d54a2d9d1a53661bd91c2afd00df79b0ce4057a66b4c953febfc464cd8')
+ '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe')
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"
sed "s|/opt/${pkgname%-bin}/${pkgname%-bin}|${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
}
diff --git a/jlivertool.sh b/jlivertool.sh
index 0d20cddc70ca..86cb3dc6a9bf 100644
--- a/jlivertool.sh
+++ b/jlivertool.sh
@@ -1,14 +1,15 @@
-#!/bin/sh
+#!/bin/bash
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 ELECTRON_FORCE_IS_PACKAGED=true
export NODE_ENV=production
cd "${_APPDIR}"
if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
- exec electron@electronversion@ "${_ASAR}" "$@" || exit $?
+ exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
else
- exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@" || exit $?
+ exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
fi \ No newline at end of file