diff options
| author | zxp19821005 | 2024-03-19 08:56:19 +0800 |
|---|---|---|
| committer | zxp19821005 | 2024-03-19 08:56:19 +0800 |
| commit | eae2457f608bf4d28f5cff70d5129ca09da36b36 (patch) | |
| tree | e5b1239976a4591d598929c1be8a9a4512fc8b2c | |
| parent | 01923e5debbd2c4c1a5a252874753214c3478e4c (diff) | |
| download | aur-eae2457f608bf4d28f5cff70d5129ca09da36b36.tar.gz | |
fix errors
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | jlivertool.sh | 5 |
3 files changed, 10 insertions, 8 deletions
@@ -1,11 +1,11 @@ pkgbase = jlivertool-bin pkgdesc = Bilibili 弹幕机 pkgver = 2.1.1 - pkgrel = 2 + pkgrel = 3 url = https://github.com/Xinrea/JLiverTool arch = x86_64 license = MIT - depends = electron26 + depends = electron26-bin depends = java-runtime provides = jlivertool=2.1.1 conflicts = jlivertool @@ -14,6 +14,6 @@ pkgbase = jlivertool-bin source = jlivertool.sh sha256sums = e0db716a2ca6258d144bf5f03b3dd98862a8760286c2190f704dce4761b89479 sha256sums = 5d86e387ac33cf32eee9c968d38483a30567690b843c3768b35fe4bc55b455a8 - sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe + sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 pkgname = jlivertool-bin @@ -2,7 +2,7 @@ pkgname=jlivertool-bin pkgver=2.1.1 _electronversion=26 -pkgrel=2 +pkgrel=3 pkgdesc="Bilibili 弹幕机" arch=('x86_64') url="https://github.com/Xinrea/JLiverTool" @@ -10,7 +10,7 @@ license=('MIT') provides=("${pkgname%-bin}=${pkgver}") conflicts=("${pkgname%-bin}") depends=( - "electron${_electronversion}" + "electron${_electronversion}-bin" 'java-runtime' ) source=( @@ -20,11 +20,12 @@ source=( ) sha256sums=('e0db716a2ca6258d144bf5f03b3dd98862a8760286c2190f704dce4761b89479' '5d86e387ac33cf32eee9c968d38483a30567690b843c3768b35fe4bc55b455a8' - '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe') + 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname%-bin}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@options@||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 86cb3dc6a9bf..7ddcaab8d734 100644 --- a/jlivertool.sh +++ b/jlivertool.sh @@ -2,6 +2,7 @@ set -e _APPDIR="/usr/lib/@appname@" _RUNNAME="${_APPDIR}/@runname@" +_OPTIONS="@options@" export PATH="${_APPDIR}:${PATH}" export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}" export ELECTRON_IS_DEV=0 @@ -9,7 +10,7 @@ export ELECTRON_FORCE_IS_PACKAGED=true export NODE_ENV=production cd "${_APPDIR}" if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $? else - exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $? fi
\ No newline at end of file |