From 4d9ac3f8e5b6c8a9c4771a1f55f7ce19ca41ac75 Mon Sep 17 00:00:00 2001 From: zxp19821005 Date: Wed, 10 Jul 2024 17:55:11 +0800 Subject: [PATCH] fix errors --- .SRCINFO | 9 +++++---- PKGBUILD | 26 ++++++++++++++------------ miru-viewer.sh | 21 +++++++++++++++++---- 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 352d156c4198..66ac63a86c32 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = miru-viewer-git pkgdesc = GitHub Issue/Pull Request/Release viewer - pkgver = 1.1.0.r0.ge890b8b + pkgver = 1.1.0.r6.gf4955c4 pkgrel = 1 url = https://github.com/ytakahashi/miru arch = any @@ -10,14 +10,15 @@ pkgbase = miru-viewer-git makedepends = git makedepends = nvm makedepends = gendesk - makedepends = base-devel + makedepends = cmake makedepends = gcc - depends = electron29 + makedepends = curl + depends = electron30 provides = miru-viewer=1.1.0 conflicts = miru-viewer source = miru-viewer.git::git+https://github.com/ytakahashi/miru.git source = miru-viewer.sh sha256sums = SKIP - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 pkgname = miru-viewer-git diff --git a/PKGBUILD b/PKGBUILD index 20a5e42641a1..2d9f818295a5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: zxp19821005 _pkgname=miru pkgname="${_pkgname}-viewer-git" -pkgver=1.1.0.r0.ge890b8b -_electronversion=29 +pkgver=1.1.0.r6.gf4955c4 +_electronversion=30 _nodeversion=18 pkgrel=1 pkgdesc="GitHub Issue/Pull Request/Release viewer" @@ -20,17 +20,18 @@ makedepends=( 'git' 'nvm' 'gendesk' - 'base-devel' + 'cmake' 'gcc' + 'curl' ) source=( "${pkgname%-git}.git::git+${url}.git" "${pkgname%-git}.sh") sha256sums=('SKIP' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') + '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') pkgver() { cd "${srcdir}/${pkgname%-git}.git" - git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' + git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g' } _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" @@ -42,22 +43,23 @@ build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname%-git}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@cfgdirname@|${_pkgname}|g" \ -e "s|@options@|env ELECTRON_OZONE_PLATFORM_HINT=auto|g" \ -i "${srcdir}/${pkgname%-git}.sh" _ensure_local_nvm - gendesk -q -f -n --pkgname="${_pkgname}-viewer-git" --categories="Utility" --name="${pkgname}%-git" --exec="${pkgname%-git} %U" + gendesk -q -f -n --pkgname="${_pkgname}-viewer-git" --pkgdesc="${pkgdesc}" --categories="Utility" --name="${pkgname%-git}" --exec="${pkgname%-git} %U" cd "${srcdir}/${pkgname%-git}.git" export npm_config_build_from_source=true 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" mkdir -p "${srcdir}/.electron-gyp" touch "${srcdir}/.electron-gyp/.yarnrc" if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];then 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 @@ -66,8 +68,8 @@ build() { yarn run rm-dist sed 's|electron-builder.js",|electron-builder.js -l --dir",|g' -i package.json sed "s|\/\${version}||g;s|mac|linux|g;s|icon.icns|icon.png|g" -i electron-builder.js - yarn install --cache-folder "${srcdir}/.yarn_cache" - yarn run electron:build + NODE_ENV=development yarn install --cache-folder "${srcdir}/.yarn_cache" + NODE_ENV=production yarn run electron:build } package() { install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}" diff --git a/miru-viewer.sh b/miru-viewer.sh index 7ddcaab8d734..4cfe3ac09dd8 100644 --- a/miru-viewer.sh +++ b/miru-viewer.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