diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | notesnook.sh | 22 |
3 files changed, 26 insertions, 15 deletions
@@ -1,6 +1,6 @@ pkgbase = notesnook-git pkgdesc = A fully open source & end-to-end encrypted note taking alternative to Evernote - pkgver = 3.0.0.r1.gfe91ef79a + pkgver = 3.0.4.r0.g58845e5 pkgrel = 1 url = https://notesnook.com/ arch = aarch64 @@ -15,13 +15,13 @@ pkgbase = notesnook-git makedepends = curl depends = electron29 depends = nodejs - provides = notesnook=3.0.0 + provides = notesnook=3.0.4 conflicts = notesnook source = notesnook.git::git+https://github.com/streetwriters/notesnook.git source = notesnook.desktop source = notesnook.sh sha256sums = SKIP sha256sums = efc8a6cea79ed0203dcbadf17632b5341952a49704f99e3ea0ddc573b06748f4 - sha256sums = 61d56055897e9d71d68e185ac2de7c4cb2fbca16eb3fb0091703612c113441f3 + sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d pkgname = notesnook-git @@ -3,7 +3,8 @@ # Contributer: Ada <adadonderr@gmail.com> # Contributor: Christian Finnberg <christian@finnberg.net> pkgname=notesnook-git -pkgver=3.0.0.r1.gfe91ef79a +_pkgname=Notesnook +pkgver=3.0.4.r0.g58845e5 _electronversion=29 _nodeversion=20 pkgrel=1 @@ -37,10 +38,10 @@ source=( ) sha256sums=('SKIP' 'efc8a6cea79ed0203dcbadf17632b5341952a49704f99e3ea0ddc573b06748f4' - '61d56055897e9d71d68e185ac2de7c4cb2fbca16eb3fb0091703612c113441f3') + '41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d') pkgver() { cd "${srcdir}/${pkgname//-/.}" - git describe --long --tags | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g;s/.android//g' + git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g;s/.android//g' } _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" @@ -51,7 +52,8 @@ _ensure_local_nvm() { build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname}|g" \ - -e "s|@runname@|app|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 @@ -61,10 +63,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 @@ -79,6 +81,7 @@ build() { npm run bootstrap -- --scope=desktop # Build Electron wrapper cd "${srcdir}/${pkgname//-/.}/apps/desktop" + sed 's|"asar": false,|"asar": true,|' -i package.json npx nx run release --project @notesnook/desktop npx electron-builder --dir } diff --git a/notesnook.sh b/notesnook.sh index 842c77e19b1d..398398461fee 100644 --- a/notesnook.sh +++ b/notesnook.sh @@ -1,21 +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}" -_FLAGS_FILE="${XDG_CONFIG_HOME}/@appname@-flags.conf" -if [ -r "${_FLAGS_FILE}" ]; then - _USER_FLAGS="$(cat "${_FLAGS_FILE}")" +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}" "${_USER_FLAGS}" "$@" || 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 "${_USER_FLAGS}" "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS[@]}" "$@" fi
\ No newline at end of file |