diff options
| -rw-r--r-- | .SRCINFO | 17 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | escrcpy.sh | 22 |
3 files changed, 27 insertions, 24 deletions
@@ -1,19 +1,20 @@ pkgbase = escrcpy-bin pkgdesc = 使用图形化的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动 - pkgver = 1.18.4 + pkgver = 1.19.3 pkgrel = 1 url = https://github.com/viarotel-org/escrcpy arch = aarch64 arch = x86_64 license = Apache-2.0 - depends = electron27 - provides = escrcpy=1.18.4 + depends = electron30 + depends = scrcpy + provides = escrcpy=1.19.3 conflicts = escrcpy source = escrcpy.sh - sha256sums = 05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a - source_aarch64 = escrcpy-1.18.4-aarch64.deb::https://github.com/viarotel-org/escrcpy/releases/download/v1.18.4/Escrcpy-1.18.4-linux-arm64.deb - sha256sums_aarch64 = 75375ab0a3270afd690f9538700037e8094ad82c5d0bd94e49ef9246a45c609a - source_x86_64 = escrcpy-1.18.4-x86_64.deb::https://github.com/viarotel-org/escrcpy/releases/download/v1.18.4/Escrcpy-1.18.4-linux-amd64.deb - sha256sums_x86_64 = 264c8f9c1f9699479bc6d067a2b97e7b64ad32b3ab7b83fd489e724092c60f41 + sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 + source_aarch64 = escrcpy-1.19.3-aarch64.deb::https://github.com/viarotel-org/escrcpy/releases/download/v1.19.3/Escrcpy-1.19.3-linux-arm64.deb + sha256sums_aarch64 = 59bf990330a1d5a6eb8abbe7f046b842984dc1ea988bdb773b01f3dd0dcff804 + source_x86_64 = escrcpy-1.19.3-x86_64.deb::https://github.com/viarotel-org/escrcpy/releases/download/v1.19.3/Escrcpy-1.19.3-linux-amd64.deb + sha256sums_x86_64 = b45b72cadf81351796d148b46f735094ca89dbebcb856303c3ca4abc825666ff pkgname = escrcpy-bin @@ -1,8 +1,8 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> pkgname=escrcpy-bin _pkgname=Escrcpy -pkgver=1.18.4 -_electronversion=27 +pkgver=1.19.3 +_electronversion=30 pkgrel=1 pkgdesc="使用图形化的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动" arch=( @@ -15,19 +15,21 @@ conflicts=("${pkgname%-bin}") provides=("${pkgname%-bin}=${pkgver}") depends=( "electron${_electronversion}" + 'scrcpy' ) source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.deb::${url}/releases/download/v${pkgver}/${_pkgname}-${pkgver}-linux-arm64.deb") source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::${url}/releases/download/v${pkgver}/${_pkgname}-${pkgver}-linux-amd64.deb") source=( "${pkgname%-bin}.sh" ) -sha256sums=('05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a') -sha256sums_aarch64=('75375ab0a3270afd690f9538700037e8094ad82c5d0bd94e49ef9246a45c609a') -sha256sums_x86_64=('264c8f9c1f9699479bc6d067a2b97e7b64ad32b3ab7b83fd489e724092c60f41') +sha256sums=('2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') +sha256sums_aarch64=('59bf990330a1d5a6eb8abbe7f046b842984dc1ea988bdb773b01f3dd0dcff804') +sha256sums_x86_64=('b45b72cadf81351796d148b46f735094ca89dbebcb856303c3ca4abc825666ff') build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname%-bin}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@cfgdirname@|${pkgname%-bin}|g" \ -e "s|@options@||g" \ -i "${srcdir}/${pkgname%-bin}.sh" bsdtar -xf "${srcdir}/data."* diff --git a/escrcpy.sh b/escrcpy.sh index 5594e5380ba2..4cfe3ac09dd8 100644 --- a/escrcpy.sh +++ b/escrcpy.sh @@ -1,7 +1,8 @@ #!/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}" @@ -11,19 +12,18 @@ 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}" -_FLAGS_FILE="${XDG_CONFIG_HOME}/@appname@-flags.conf" -declare -a flags +export _FLAGS_FILE="${XDG_CONFIG_HOME}/${_CFGDIR}@appname@-flags.conf" +declare -a _USER_FLAGS if [[ -f "${_FLAGS_FILE}" ]]; then - mapfile -t < "${_FLAGS_FILE}" + while read -r line; do + if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then + _USER_FLAGS+=("${line}") + fi + done < "${_FLAGS_FILE}" fi -for line in "${MAPFILE[@]}"; do - if [[ ! "${line}" =~ ^[[:space:]]*#.* ]] && [[ -n "${line}" ]]; then - flags+=("${line}") - fi -done cd "${_APPDIR}" if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS}" "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} "${_USER_FLAGS[@]}" "$@" else - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS}" "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} --no-sandbox "${_USER_FLAGS[@]}" "$@" fi
\ No newline at end of file |