update to 2.6.15

3 files changed, 29 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd3544ac7674..bd5c844de975 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = notesnook
 	pkgdesc = A fully open source & end-to-end encrypted note taking alternative to Evernote
-	pkgver = 2.6.14
-	pkgrel = 2
+	pkgver = 2.6.15
+	pkgrel = 1
 	url = https://notesnook.com/
+	arch = aarch64
 	arch = x86_64
-	license = GPL3
+	license = GPL-3.0-or-later
 	makedepends = nvm
 	makedepends = npm
 	makedepends = git
@@ -13,13 +14,13 @@ pkgbase = notesnook
 	makedepends = make
 	makedepends = gcc
 	depends = electron25
-	provides = notesnook=2.6.14
+	provides = notesnook=2.6.15
 	conflicts = notesnook
-	source = notesnook.git::git+https://github.com/streetwriters/notesnook.git#tag=v2.6.14
+	source = notesnook.git::git+https://github.com/streetwriters/notesnook.git#tag=v2.6.15
 	source = notesnook.desktop
 	source = notesnook.sh
 	sha256sums = SKIP
 	sha256sums = 102a538ee9432310d854842a578cd3371df0431b4db617479de66aa45b5f2440
-	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+	sha256sums = 1d3f21d54a2d9d1a53661bd91c2afd00df79b0ce4057a66b4c953febfc464cd8
 
 pkgname = notesnook
diff --git a/PKGBUILD b/PKGBUILD
index 618ee72e7f54..ea9aad349842 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,15 +6,18 @@
 # Contributor: Ada <adadonderr@gmail.com>
 # Contributor: Christian Finnberg <christian@finnberg.net>
 pkgname=notesnook
-pkgver=2.6.14
+pkgver=2.6.15
 _electronversion=25
 _nodeversion=16
-pkgrel=2
+pkgrel=1
 pkgdesc="A fully open source & end-to-end encrypted note taking alternative to Evernote"
-arch=('x86_64')
+arch=(
+    'aarch64'
+    'x86_64'
+)
 url="https://notesnook.com/"
 _ghurl="https://github.com/streetwriters/notesnook"
-license=('GPL3')
+license=('GPL-3.0-or-later')
 provides=("${pkgname}=${pkgver}")
 conflicts=("${pkgname}")
 depends=(
@@ -36,7 +39,7 @@ source=(
 )
 sha256sums=('SKIP'
             '102a538ee9432310d854842a578cd3371df0431b4db617479de66aa45b5f2440'
-            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+            '1d3f21d54a2d9d1a53661bd91c2afd00df79b0ce4057a66b4c953febfc464cd8')
 _ensure_local_nvm() {
     export NVM_DIR="${srcdir}/.nvm"
     source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
@@ -49,24 +52,27 @@ build() {
         -e "s|@appasar@|app|g" \
         -i "${srcdir}/${pkgname}.sh"
     _ensure_local_nvm
-    cd "${srcdir}/${pkgname}.git"
     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}"
-    sed -e "3i\  \"version\": \"${pkgver}\"," \
-        -e "3i\  \"description\": \"${pkgdesc}\"," \
-        -e "3i\  \"author\": \"Streetwriters (Private) Limited,support@streetwriters.co,https://streetwriters.co\"," \
-        -e "55i\    \"electron\": \"25.9.3\"," \
-        -i package.json
-    npm install --ignore-scripts --prefer-offline --no-audit
+    export npm_config_disturl=https://electronjs.org/headers
+    HOME="${srcdir}/.electron-gyp"
+    #build
+    cd "${srcdir}/${pkgname}.git"
+    # Install packages
+    npm ci --ignore-scripts --prefer-offline --no-audit
     npm run bootstrap -- --scope=web
+    # Generate desktop build
     npx nx build:desktop @notesnook/web
     npm run bootstrap -- --scope=desktop
+    # Build Electron wrapper
     cd "${srcdir}/${pkgname}.git/apps/desktop"
     npx nx run release --project @notesnook/desktop
-    npx electron-builder --linux AppImage:x64 AppImage:arm64 -p never
+    # Build AppImage
+    npx electron-builder -l AppImage:x64 AppImage:arm64 -p never
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
diff --git a/notesnook.sh b/notesnook.sh
index aacd8f895847..0d20cddc70ca 100644
--- a/notesnook.sh
+++ b/notesnook.sh
@@ -8,8 +8,7 @@ export ELECTRON_IS_DEV=0
 export NODE_ENV=production
 cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_ASAR}" "$@"
+    exec electron@electronversion@ "${_ASAR}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
-exit
\ No newline at end of file
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@" || exit $?
+fi
\ No newline at end of file