diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 41 | ||||
| -rw-r--r-- | jlivertool.sh | 21 |
3 files changed, 45 insertions, 31 deletions
@@ -1,21 +1,21 @@ pkgbase = jlivertool pkgdesc = Bilibili 弹幕机 - pkgver = 2.1.1 - pkgrel = 3 + pkgver = 2.1.2 + pkgrel = 1 url = https://github.com/Xinrea/JLiverTool arch = x86_64 license = MIT makedepends = npm makedepends = nodejs makedepends = gendesk - makedepends = git - depends = electron26-bin + makedepends = curl + depends = electron26 depends = java-runtime provides = jlivertool conflicts = jlivertool - source = jlivertool.git::git+https://github.com/Xinrea/JLiverTool.git#tag=v2.1.1 + source = jlivertool-2.1.2.tar.gz::https://github.com/Xinrea/JLiverTool/archive/refs/tags/v2.1.2.tar.gz source = jlivertool.sh - sha256sums = 87c774327abbb4b30d8ade549cbe2fff4b514dd092564862d00bce6e70e4645d - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = fe0cad1a96ac2aa8470411268eca5fbbeb92a020500e45413f129d999a23844d + sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 pkgname = jlivertool @@ -1,9 +1,9 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> pkgname=jlivertool _pkgname=JLiverTool -pkgver=2.1.1 +pkgver=2.1.2 _electronversion=26 -pkgrel=3 +pkgrel=1 pkgdesc="Bilibili 弹幕机" arch=('x86_64') url="https://github.com/Xinrea/JLiverTool" @@ -11,52 +11,53 @@ license=('MIT') provides=("${pkgname}") conflicts=("${pkgname}") depends=( - "electron${_electronversion}-bin" + "electron${_electronversion}" 'java-runtime' ) makedepends=( 'npm' 'nodejs' 'gendesk' - 'git' + 'curl' ) source=( - "${pkgname}.git::git+${url}.git#tag=v${pkgver}" + "${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz" "${pkgname}.sh" ) -sha256sums=('87c774327abbb4b30d8ade549cbe2fff4b514dd092564862d00bce6e70e4645d' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') +sha256sums=('fe0cad1a96ac2aa8470411268eca5fbbeb92a020500e45413f129d999a23844d' + '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@cfgdirname@|${pkgname}|g" \ -e "s|@options@||g" \ -i "${srcdir}/${pkgname}.sh" - gendesk -q -f -n --categories="Utility" --name="${_pkgname}" --exec="${pkgname}" - cd "${srcdir}/${pkgname}.git" + gendesk -q -f -n --pkgname="${pkgname}" --pkgdesc="${pkgdesc}" --categories="Utility" --name="${_pkgname}" --exec="${pkgname} %U" + cd "${srcdir}/${_pkgname}-${pkgver}" export npm_config_build_from_source=true export npm_config_cache="${srcdir}/.npm_cache" export ELECTRON_SKIP_BINARY_DOWNLOAD=1 - export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')" - export npm_config_target="${SYSTEM_ELECTRON_VERSION}" - export ELECTRONVERSION="${_electronversion}" - 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}" HOME="${srcdir}/.electron-gyp" if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];then - echo 'registry="https://registry.npmmirror.com/"' >> .npmrc - echo 'electron_mirror="https://registry.npmmirror.com/-/binary/electron/"' >> .npmrc - echo 'electron_builder_binaries_mirror="https://registry.npmmirror.com/-/binary/electron-builder-binaries/"' >> .npmrc + export npm_config_registry=https://registry.npmmirror.com + export npm_config_disturl=https://registry.npmmirror.com/-/binary/node/ + export npm_config_electron_mirror=https://registry.npmmirror.com/-/binary/electron/ + export npm_config_electron_builder_binaries_mirror=https://registry.npmmirror.com/-/binary/electron-builder-binaries/ else echo "Your network is OK." fi - sed "s|--linux -p never|--dir|g" -i package.json + sed "s|--linux|-l --dir|g" -i package.json npm install npm run build-linux } package() { install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 "${srcdir}/${pkgname}.git/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}" - cp -r "${srcdir}/${pkgname}.git/dist/linux-"*/resources/app.asar.unpacked "${pkgdir}/usr/lib/${pkgname}" + install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}" + cp -r "${srcdir}/${_pkgname}-${pkgver}/dist/linux-"*/resources/app.asar.unpacked "${pkgdir}/usr/lib/${pkgname}" install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications" - install -Dm644 "${srcdir}/${pkgname}.git/LICENSE.md" -t "${pkgdir}/usr/share/licenses/${pkgname}" + install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/LICENSE.md" -t "${pkgdir}/usr/share/licenses/${pkgname}" }
\ No newline at end of file diff --git a/jlivertool.sh b/jlivertool.sh index 7ddcaab8d734..4cfe3ac09dd8 100644 --- a/jlivertool.sh +++ b/jlivertool.sh @@ -1,16 +1,29 @@ #!/bin/bash -set -e +set -o pipefail _APPDIR="/usr/lib/@appname@" _RUNNAME="${_APPDIR}/@runname@" +_CFGDIR="@cfgdirname@/" _OPTIONS="@options@" 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 ELECTRON_DISABLE_SECURITY_WARNINGS=true +export ELECTRON_OVERRIDE_DIST_PATH="/usr/bin/electron@electronversion@" export NODE_ENV=production +export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" +export _FLAGS_FILE="${XDG_CONFIG_HOME}/${_CFGDIR}@appname@-flags.conf" +declare -a _USER_FLAGS +if [[ -f "${_FLAGS_FILE}" ]]; then + while read -r line; do + if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then + _USER_FLAGS+=("${line}") + fi + done < "${_FLAGS_FILE}" +fi cd "${_APPDIR}" -if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $? +if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then + exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} "${_USER_FLAGS[@]}" "$@" else - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} --no-sandbox "${_USER_FLAGS[@]}" "$@" fi
\ No newline at end of file |