diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | jlivertool.sh | 9 |
3 files changed, 14 insertions, 13 deletions
@@ -1,7 +1,7 @@ pkgbase = jlivertool pkgdesc = Bilibili 弹幕机 pkgver = 2.1.1 - pkgrel = 1 + pkgrel = 2 url = https://github.com/Xinrea/JLiverTool arch = x86_64 license = MIT @@ -16,6 +16,6 @@ pkgbase = jlivertool source = jlivertool.git::git+https://github.com/Xinrea/JLiverTool.git#tag=v2.1.1 source = jlivertool.sh sha256sums = SKIP - sha256sums = 1d3f21d54a2d9d1a53661bd91c2afd00df79b0ce4057a66b4c953febfc464cd8 + sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe pkgname = jlivertool @@ -3,7 +3,7 @@ pkgname=jlivertool _pkgname=JLiverTool pkgver=2.1.1 _electronversion=26 -pkgrel=1 +pkgrel=2 pkgdesc="Bilibili 弹幕机" arch=('x86_64') url="https://github.com/Xinrea/JLiverTool" @@ -25,23 +25,23 @@ source=( "${pkgname}.sh" ) sha256sums=('SKIP' - '1d3f21d54a2d9d1a53661bd91c2afd00df79b0ce4057a66b4c953febfc464cd8') + '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe') build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname}|g" \ - -e "s|@appasar@|app.asar|g" \ + -e "s|@runname@|app.asar|g" \ -i "${srcdir}/${pkgname}.sh" - gendesk -q -f -n --categories "Utility" --name "${_pkgname}" --exec "${pkgname}" + gendesk -q -f -n --categories="Utility" --name="${_pkgname}" --exec="${pkgname}" cd "${srcdir}/${pkgname}.git" export npm_config_build_from_source=true export npm_config_cache="${srcdir}/.npm_cache" export ELECTRON_SKIP_BINARY_DOWNLOAD=1 - export npm_config_disturl=https://electronjs.org/headers export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')" export npm_config_target="${SYSTEM_ELECTRON_VERSION}" export ELECTRONVERSION="${_electronversion}" - export HOME="${srcdir}/.electron-gyp" - sed '53,58d;42,47d' -i package.json + export npm_config_disturl=https://electronjs.org/headers + HOME="${srcdir}/.electron-gyp" + sed "s|--linux|-l AppImage|g" -i package.json npm install npm run build-linux } 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 |