bur
/
jjr-joplin
1
0
Fork 0
Code Issues Pull Requests Releases Activity

upgpkg: joplin 1.5.12-1 

upstream release

Add JQ to make depends
main
Alfredo Palhares 2020-12-29 17:18:05 +00:00
parent 45a396d317
commit b616093ca9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.SRCINFO
View File

@ -11,6 +11,7 @@ pkgbase = joplin
makedepends = npm makedepends = npm
makedepends = python makedepends = python
makedepends = rsync makedepends = rsync
makedepends = jq
depends = electron depends = electron
depends = gtk3 depends = gtk3
depends = libexif depends = libexif

8
PKGBUILD
View File

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