summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Webster2020-03-01 21:09:43 +1300
committerNick Webster2020-03-01 21:09:43 +1300
commitfc8f0610d43153d82e033ddef41e2e01dcaac26c (patch)
tree5abb7b94c9bbd6dbd41baf79965f3a72e3314ef1
parentbad99d72c9fa5f8030ecd82cf0b189e4236823c9 (diff)
downloadaur-fc8f0610d43153d82e033ddef41e2e01dcaac26c.tar.gz
Updating to v3.21.9 from upstream
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD20
-rwxr-xr-xmicropad-bin5
-rw-r--r--micropad.install10
4 files changed, 18 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 436ea2a08945..43c2a3eb018a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
pkgbase = micropad
pkgdesc = A powerful note-taking app that helps you organise + take notes without restrictions.
- pkgver = 3.21.6
+ pkgver = 3.21.9
pkgrel = 1
url = https://getmicropad.com
install = micropad.install
arch = x86_64
license = MPL2
depends = electron>=6.0.0
- source = https://github.com/MicroPad/Electron/releases/download/v3.21.6/micropad-3.21.6.pacman
+ source = https://github.com/MicroPad/Electron/releases/download/v3.21.9/micropad-3.21.9.pacman
source = micropad-bin
- md5sums = 98b0fe7dd8721806212993d0e6d16b09
- md5sums = 52be1867031e5fad9428138cdb6d027e
+ md5sums = 7129d2f35e42ac0bb6dfefc6499c337c
+ md5sums = f763f23b4887a15000b3aeac8d6c3439
pkgname = micropad
diff --git a/PKGBUILD b/PKGBUILD
index 1120f687c115..8cc66102da38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Nick Webster <nick@nick.geek.nz>
pkgname=micropad
-pkgver=3.21.6
+pkgver=3.21.9
pkgrel=1
pkgdesc="A powerful note-taking app that helps you organise + take notes without restrictions."
arch=('x86_64')
@@ -14,16 +14,20 @@ source=(
"micropad-bin"
)
md5sums=(
- '98b0fe7dd8721806212993d0e6d16b09'
- '52be1867031e5fad9428138cdb6d027e'
+ '7129d2f35e42ac0bb6dfefc6499c337c'
+ 'f763f23b4887a15000b3aeac8d6c3439'
)
install="micropad.install"
package() {
- # Replace bundled binary to use the community electron package
- chmod +x "${srcdir}/micropad-bin"
- cp "${srcdir}/micropad-bin" opt/µPad/micropad
+ install -dm755 "$pkgdir/opt/µPad"
+ cp -a opt/µPad/resources "$pkgdir/opt/µPad/"
+ cp -a usr "$pkgdir/usr"
- mv opt "${pkgdir}/opt"
- mv usr "${pkgdir}/usr"
+ # Use system electron
+ install -Dm755 "$pkgname-bin" "$pkgdir/opt/µPad/$pkgname"
+
+ # Link to the binary
+ install -dm755 "$pkgdir/usr/bin"
+ ln -sf /opt/µPad/micropad "$pkgdir/usr/bin/$pkgname"
}
diff --git a/micropad-bin b/micropad-bin
index bbbfcb20b54c..d40dd736fe7d 100755
--- a/micropad-bin
+++ b/micropad-bin
@@ -1,5 +1,2 @@
#!/bin/sh
-electron --asar /opt/µPad/resources/app.asar &
-disown %1
-exit
-
+electron --asar /opt/µPad/resources/app.asar "$@"
diff --git a/micropad.install b/micropad.install
index a58809ee6d44..30d0bda569be 100644
--- a/micropad.install
+++ b/micropad.install
@@ -1,16 +1,8 @@
-post_install() {
- :
-#!/bin/bash
-
-# Link to the binary
-ln -sf '/opt/µPad/micropad' '/usr/local/bin/micropad'
-
-}
post_remove() {
:
#!/bin/bash
# Delete the link to the binary
-rm -f '/usr/local/bin/micropad'
+rm -f '/usr/bin/micropad'
}