summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorluxcem2020-10-26 13:51:46 +0100
committerluxcem2020-10-26 13:51:46 +0100
commitb977bc4edf4a229b970b434eac699fd7c16dc7ef (patch)
treea9eabb157a6c9256fb9a93710cf49c7eea2ae511
parent44fc5bd8c08f4624b379c9d1fe259e6ce29166f0 (diff)
downloadaur-b977bc4edf4a229b970b434eac699fd7c16dc7ef.tar.gz
Fix issue with wrong electron version used for build.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD16
-rwxr-xr-xinsomnia.sh2
3 files changed, 13 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5ab99eec82f2..d23c84b59180 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = insomnia
pkgdesc = Cross-platform HTTP and GraphQL Client
pkgver = 2020.4.1
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/Kong/insomnia
arch = any
license = MIT
@@ -13,7 +13,7 @@ pkgbase = insomnia
source = node-any.patch
b2sums = 9d6d8323307b28994500b0aa379ddec0243ed4ba6599690c42e90ff886946f1fbbc4364a543deaa69aa18d70b320ab9b6b4858f6d642cf17064b8d722b80c57e
b2sums = d2ceeb224fa3a35551b0929648d5e066da93a451a66b73373c13ed0dd89575a2482c2dc8e7499b214d0d62cca2532189dac9a681537751a5a86b592cae5686c7
- b2sums = 36e005db6302a01287d9d7b19cd0780efaff9799098f292f92aeda8c62cad1864f58eb8ad81ae37777ff4fd660fed4db85f35f9b6b309cb1ca7c84c2c2de29e7
+ b2sums = 7ea4aff2779267bfc5f7be5533d70b07a3da1c8bfed424c9f6cc9806fe6567a4cd40144264a8827b016e51f31c6dbb395c90aac4d333f297070213c77a0b2c9c
b2sums = db40a0e7d85cb8378c1f973150249d67e5cfc5d018787b733f2516892144f3c536e1587cdba2eec5da800ee474d4bccf090379b371cb6c59a0a9829090012896
pkgname = insomnia
diff --git a/PKGBUILD b/PKGBUILD
index 7e2f9ec557da..0976e475789e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
-# Maintainer: kpcyrd <kpcyrd[at]archlinux[dot]org>
+# Maintainer: luxcem <a@luxcem.fr>
+# Contributor: kpcyrd <kpcyrd[at]archlinux[dot]org>
# Contributor: vscncls <lucaslou4@protonmail.com>
pkgname=insomnia
pkgver=2020.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="Cross-platform HTTP and GraphQL Client"
url="https://github.com/Kong/insomnia"
arch=('any')
@@ -18,15 +19,18 @@ source=(
)
b2sums=('9d6d8323307b28994500b0aa379ddec0243ed4ba6599690c42e90ff886946f1fbbc4364a543deaa69aa18d70b320ab9b6b4858f6d642cf17064b8d722b80c57e'
'd2ceeb224fa3a35551b0929648d5e066da93a451a66b73373c13ed0dd89575a2482c2dc8e7499b214d0d62cca2532189dac9a681537751a5a86b592cae5686c7'
- '36e005db6302a01287d9d7b19cd0780efaff9799098f292f92aeda8c62cad1864f58eb8ad81ae37777ff4fd660fed4db85f35f9b6b309cb1ca7c84c2c2de29e7'
+ '7ea4aff2779267bfc5f7be5533d70b07a3da1c8bfed424c9f6cc9806fe6567a4cd40144264a8827b016e51f31c6dbb395c90aac4d333f297070213c77a0b2c9c'
'db40a0e7d85cb8378c1f973150249d67e5cfc5d018787b733f2516892144f3c536e1587cdba2eec5da800ee474d4bccf090379b371cb6c59a0a9829090012896')
prepare() {
- cd ${pkgname}-core-${pkgver}
+ # Use local node and electron version
+ # See https://wiki.archlinux.org/index.php/Electron_package_guidelines
- # remove hard lock to node 12
+ cd ${pkgname}-core-${pkgver}
node --version | sed s/v// > .nvmrc
patch --forward --strip=1 --input="${srcdir}/node-any.patch"
+ electron_version=$(electron --version | sed s/v//)
+ sed -i 's/"electron": ".\+"/"electron": "'"$electron_version"'"/g' packages/insomnia-app/package.json
}
build() {
@@ -37,6 +41,7 @@ build() {
package() {
# Install start script
+ echo "package"
install -Dm755 ${pkgname}.sh "${pkgdir}/usr/bin/insomnia"
install -Dm644 ${pkgname}.desktop -t "${pkgdir}/usr/share/applications"
@@ -50,4 +55,3 @@ package() {
install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
}
-# vim: ts=2 sw=2 et:
diff --git a/insomnia.sh b/insomnia.sh
index 1f195211e45a..6a04217b388b 100755
--- a/insomnia.sh
+++ b/insomnia.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-exec electron /usr/share/insomnia/app.asar \$@
+exec electron /usr/share/insomnia/app.asar "$@"