rewrite and update PKGBUILD

4 files changed, 65 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3394c6357979..5ab99eec82f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
-pkgbase = insomnia-src
-	pkgdesc = Cross-platform HTTP and GraphQL Client (Build from source)
-	pkgver = 7.1.1
-	pkgrel = 5
+pkgbase = insomnia
+	pkgdesc = Cross-platform HTTP and GraphQL Client
+	pkgver = 2020.4.1
+	pkgrel = 1
 	url = https://github.com/Kong/insomnia
-	arch = x86_64
-	arch = i686
+	arch = any
 	license = MIT
-	makedepends = nodejs-lts-dubnium
-	depends = electron4
-	depends = npm
-	provides = insomnia
-	conflicts = insomnia
-	source = https://github.com/Kong/insomnia/archive/v7.1.1.tar.gz
+	makedepends = npm
+	depends = electron
+	source = https://github.com/Kong/insomnia/archive/core@2020.4.1/insomnia-2020.4.1.tar.gz
 	source = insomnia.desktop
 	source = insomnia.sh
-	sha256sums = eca542e1e5119b1632033c6beae28f924625a0fd3ce21cdbcf1730bc44c6187c
-	sha256sums = 69358bb19108f09b78d97aba7d1813898858be449a13f2d8a6ad03cdce1400a8
-	sha256sums = fbf24757aeaca7ceab18965774573bff2be540c948a47dd3f95c7b7857ef411c
+	source = node-any.patch
+	b2sums = 9d6d8323307b28994500b0aa379ddec0243ed4ba6599690c42e90ff886946f1fbbc4364a543deaa69aa18d70b320ab9b6b4858f6d642cf17064b8d722b80c57e
+	b2sums = d2ceeb224fa3a35551b0929648d5e066da93a451a66b73373c13ed0dd89575a2482c2dc8e7499b214d0d62cca2532189dac9a681537751a5a86b592cae5686c7
+	b2sums = 36e005db6302a01287d9d7b19cd0780efaff9799098f292f92aeda8c62cad1864f58eb8ad81ae37777ff4fd660fed4db85f35f9b6b309cb1ca7c84c2c2de29e7
+	b2sums = db40a0e7d85cb8378c1f973150249d67e5cfc5d018787b733f2516892144f3c536e1587cdba2eec5da800ee474d4bccf090379b371cb6c59a0a9829090012896
 
-pkgname = insomnia-src
+pkgname = insomnia
 
diff --git a/PKGBUILD b/PKGBUILD
index 73209d3785e2..7e2f9ec557da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,63 +1,53 @@
-# Maintainer: vscncls <lucaslou4@protonmail.com>
+# Maintainer: kpcyrd <kpcyrd[at]archlinux[dot]org>
+# Contributor: vscncls <lucaslou4@protonmail.com>
 
-pkgname=insomnia-src
-_name=insomnia
-pkgver=7.1.1
-pkgrel=5
-pkgdesc="Cross-platform HTTP and GraphQL Client (Build from source)"
+pkgname=insomnia
+pkgver=2020.4.1
+pkgrel=1
+pkgdesc="Cross-platform HTTP and GraphQL Client"
 url="https://github.com/Kong/insomnia"
-arch=('x86_64' 'i686')
+arch=('any')
 license=('MIT')
-depends=('electron4' 'npm')
-makedepends=('nodejs-lts-dubnium')
-provides=("$_name")
-conflicts=("$_name")
+depends=('electron')
+makedepends=('npm')
 source=(
-    "${url}/archive/v${pkgver}.tar.gz"
-    "${_name}.desktop"
-    "${_name}.sh"
-)
-sha256sums=(
-    'eca542e1e5119b1632033c6beae28f924625a0fd3ce21cdbcf1730bc44c6187c'
-    '69358bb19108f09b78d97aba7d1813898858be449a13f2d8a6ad03cdce1400a8'
-    'fbf24757aeaca7ceab18965774573bff2be540c948a47dd3f95c7b7857ef411c'
+  "https://github.com/Kong/insomnia/archive/core@${pkgver}/${pkgname}-${pkgver}.tar.gz"
+  "insomnia.desktop"
+  "insomnia.sh"
+  "node-any.patch"
 )
+b2sums=('9d6d8323307b28994500b0aa379ddec0243ed4ba6599690c42e90ff886946f1fbbc4364a543deaa69aa18d70b320ab9b6b4858f6d642cf17064b8d722b80c57e'
+        'd2ceeb224fa3a35551b0929648d5e066da93a451a66b73373c13ed0dd89575a2482c2dc8e7499b214d0d62cca2532189dac9a681537751a5a86b592cae5686c7'
+        '36e005db6302a01287d9d7b19cd0780efaff9799098f292f92aeda8c62cad1864f58eb8ad81ae37777ff4fd660fed4db85f35f9b6b309cb1ca7c84c2c2de29e7'
+        'db40a0e7d85cb8378c1f973150249d67e5cfc5d018787b733f2516892144f3c536e1587cdba2eec5da800ee474d4bccf090379b371cb6c59a0a9829090012896')
 
 prepare() {
-    cd $_name-$pkgver/packages/insomnia-app
-    # Change package.json's electron version
-    electronV=$(electron4 --version)
-    electronVer=${electronV#v}
-    sed -i "/\"electron\": \"/c\\\"electron\": \"$electronVer\"," package.json
-
-    # Edit electron builder config so only the linux-unpacked package is built
-    sed -i 's/"AppImage",//' .electronbuilder
-    sed -i 's/"deb",//' .electronbuilder
-    sed -i 's/"tar.gz",//' .electronbuilder
-    sed -i 's/"snap",//' .electronbuilder
-    sed -i 's/"rpm"/"dir"/' .electronbuilder
-
-    sed -i "s#\"appId\": \"__APP_ID__\",#\"appId\": \"com.insomnia.app\",#" .electronbuilder
+  cd ${pkgname}-core-${pkgver}
+
+  # remove hard lock to node 12
+  node --version | sed s/v// > .nvmrc
+  patch --forward --strip=1 --input="${srcdir}/node-any.patch"
 }
 
 build() {
-    cd $_name-$pkgver
-    npm run bootstrap
-    npm run app-package
+  cd ${pkgname}-core-${pkgver}
+  npm run bootstrap
+  GIT_TAG="core@${pkgver}" npm run app-package
 }
 
 package() {
-    # Install asar file
-    install -Dm644 $_name-$pkgver/packages/insomnia-app/dist/linux-unpacked/resources/app.asar $pkgdir/usr/share/insomnia/app.asar
+  # Install start script
+  install -Dm755 ${pkgname}.sh "${pkgdir}/usr/bin/insomnia"
+  install -Dm644 ${pkgname}.desktop -t "${pkgdir}/usr/share/applications"
 
-    # Install start script
-    install -Dm755 $_name.sh $pkgdir/usr/bin/$_name
+  cd ${pkgname}-core-${pkgver}
+  install -Dm644 packages/insomnia-app/dist/com.insomnia.app/linux-unpacked/resources/app.asar -t "${pkgdir}/usr/share/insomnia"
 
-    install -Dm644 $_name.desktop $pkgdir/usr/share/applications/$_name.desktop
+  for size in 16 32 48 128 256 512; do
+    install -Dm644 packages/insomnia-app/build/com.insomnia.app/static/icon.png "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/insomnia.png"
+  done
 
-    for size in 16 32 48 128 256 512; do
-        install -Dm644 $_name-$pkgver/packages/insomnia-app/build/static/icon.png "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/insomnia.png"
-    done
-
-    install -Dm644 $_name-$pkgver/LICENSE $pkgdir/usr/share/licenses/$_name/LICENSE
+  install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/insomnia.sh b/insomnia.sh
index e72e8eacc731..1f195211e45a 100755
--- a/insomnia.sh
+++ b/insomnia.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec electron4 /usr/share/insomnia/app.asar \$@
+exec electron /usr/share/insomnia/app.asar \$@
diff --git a/node-any.patch b/node-any.patch
new file mode 100644
index 000000000000..f5276b10f190
--- /dev/null
+++ b/node-any.patch
@@ -0,0 +1,14 @@
+--- a/packages/insomnia-app/scripts/build.js
++++ b/packages/insomnia-app/scripts/build.js
+@@ -56,11 +56,6 @@ module.exports.start = async function(forceFromGitRef) {
+   console.log(`[build] npm: ${childProcess.spawnSync('npm', ['--version']).stdout}`.trim());
+   console.log(`[build] node: ${childProcess.spawnSync('node', ['--version']).stdout}`.trim());
+ 
+-  if (process.version.indexOf('v12.') !== 0) {
+-    console.log('[build] Node v12.x.x is required to build');
+-    process.exit(1);
+-  }
+-
+   // Remove folders first
+   console.log('[build] Removing existing directories');
+   await emptyDir(buildFolder);