diff options
author | zxp19821005 | 2024-05-13 17:30:45 +0800 |
---|---|---|
committer | zxp19821005 | 2024-05-13 17:30:45 +0800 |
commit | 200871a76d5a74f1edabad7913b9b133e522b9fb (patch) | |
tree | 89df12c4acbef3717c88bfccd64ca3a30d4dd22c | |
parent | 84db1b072f80cd407e2a41bc15015a2f2c2f442c (diff) | |
download | aur-200871a76d5a74f1edabad7913b9b133e522b9fb.tar.gz |
update to 1.34.14.r0.g566c440
-rw-r--r-- | .SRCINFO | 7 | ||||
-rw-r--r-- | PKGBUILD | 12 | ||||
-rw-r--r-- | work-log-ify.sh | 21 |
3 files changed, 28 insertions, 12 deletions
@@ -1,6 +1,6 @@ pkgbase = work-log-ify-git pkgdesc = Track your work.Spend less time on what's required, more time on what's important. - pkgver = 1.34.6.r0.g60f5574 + pkgver = 1.34.14.r0.g566c440 pkgrel = 1 url = https://github.com/dmitrijs/WorkLogIfy arch = any @@ -9,12 +9,13 @@ pkgbase = work-log-ify-git makedepends = git makedepends = nvm makedepends = gendesk + makedepends = curl depends = electron26 - provides = work-log-ify=1.34.6 + provides = work-log-ify=1.34.14 conflicts = work-log-ify source = work-log-ify.git::git+https://github.com/dmitrijs/WorkLogIfy.git source = work-log-ify.sh sha256sums = SKIP - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d pkgname = work-log-ify-git @@ -1,7 +1,7 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> pkgname=work-log-ify-git _pkgname=WorkLogIfy -pkgver=1.34.6.r0.g60f5574 +pkgver=1.34.14.r0.g566c440 _electronversion=26 _nodeversion=18 pkgrel=1 @@ -19,15 +19,16 @@ makedepends=( 'git' 'nvm' 'gendesk' + 'curl' ) source=( "${pkgname%-git}.git::git+${url}.git" "${pkgname%-git}.sh") sha256sums=('SKIP' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') + '41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d') 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" @@ -39,10 +40,11 @@ build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname%-git}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@cfgdirname@|${pkgname%-git}|g" \ -e "s|@options@||g" \ -i "${srcdir}/${pkgname%-git}.sh" _ensure_local_nvm - gendesk -q -f -n --categories="Utility" --name="${_pkgname}" --exec="${pkgname%-git} %U" + gendesk -q -f -n --pkgname="${pkgname%-git}" --categories="Utility" --name="${_pkgname}" --exec="${pkgname%-git} %U" cd "${srcdir}/${pkgname%-git}.git" export npm_config_build_from_source=true export npm_config_cache="${srcdir}/.npm_cache" @@ -50,10 +52,10 @@ build() { #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 HOME="${srcdir}/.electron-gyp" 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 diff --git a/work-log-ify.sh b/work-log-ify.sh index 7ddcaab8d734..398398461fee 100644 --- a/work-log-ify.sh +++ b/work-log-ify.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 |