From b616093ca9e61bff83ff5e02ec2d56d04f8fefa5 Mon Sep 17 00:00:00 2001
From: Alfredo Palhares <alfredo@palhares.me>
Date: Tue, 29 Dec 2020 17:18:05 +0000
Subject: [PATCH] upgpkg: joplin 1.5.12-1

upstream release

Add JQ to make depends
---
 .SRCINFO | 1 +
 PKGBUILD | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 6816db4..287d825 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,6 +11,7 @@ pkgbase = joplin
 	makedepends = npm
 	makedepends = python
 	makedepends = rsync
+	makedepends = jq
 	depends = electron
 	depends = gtk3
 	depends = libexif
diff --git a/PKGBUILD b/PKGBUILD
index 91faa21..3bf14c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss'
          'nss' 'orc' 'rsync' )
 optdepends=('libappindicator-gtk3: for tray icon')
 arch=('x86_64' 'i686')
-makedepends=('git' 'npm' 'python' 'rsync')
+makedepends=('git' 'npm' 'python' 'rsync' 'jq')
 url="https://joplinapp.org/"
 license=('MIT')
 source=("joplin.desktop" "joplin-desktop.sh" "joplin.sh"
@@ -40,13 +40,13 @@ prepare() {
   local cache=$(_get_cache)
   msg2 "npm cache directory: $cache"
 
-  # TODO why disabling husky?
   msg2 "Disabling husky (git hooks)"
   sed -i '/"husky": ".*"/d' "${srcdir}/joplin-${pkgver}/package.json"
 
   msg2 "Tweaking lerna.json"
   local tmp_json="$(mktemp --tmpdir="$srcdir")"
   local lerna_json="${srcdir}/joplin-${pkgver}/lerna.json"
+  # TODO: Add check for lerna.json file
   jq ".packages = [
         \"packages/app-cli\", \"packages/app-desktop\",
         \"packages/fork-htmlparser2\", \"packages/fork-sax\",
@@ -111,10 +111,10 @@ package_joplin() {
   # See https://github.com/npm/cli/issues/1103 for details.
   find "${pkgdir}/usr" -type d -exec chmod 755 {} +
 
-  msg2 "Remove References to \$pkgdir"
+  msg2 "Removing References to \$pkgdir"
   find "$pkgdir" -name package.json -print0 | xargs -0 sed -i "/_where/d"
 
-  msg2 "Remove References to \$srcdir"
+  msg2 "Removing References to \$srcdir"
   local tmppackage="$(mktemp --tmpdir="$srcdir")"
   local pkgjson="$pkgdir/usr/share/joplin/package.json" # TODO joplin name
   jq '.|=with_entries(select(.key|test("_.+")|not))' "$pkgjson" > "$tmppackage"