Bind to system electron

3 files changed, 22 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2dc3c5474dca..e6c1f690403d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,12 +8,13 @@ pkgbase = mattermost-desktop
 	license = Apache
 	makedepends = npm
 	makedepends = git
-	depends = electron
+	makedepends = jq
+	depends = electron5
 	source = mattermost-desktop-4.3.2.tar.gz::https://github.com/mattermost/desktop/archive/4.3.2.tar.gz
 	source = mattermost-desktop.sh
 	source = mattermost.desktop
 	sha512sums = 40e871e0699b1e0ba7670024a368498d7477b5716ff3523ab04bb9c1567bb577cfc220071f6d0228ec2b1fdfe4caeaeba859fe47faf47c76e8f0dd135ef3cf78
-	sha512sums = 7cce5fad5a923fbde106d0e67ce42d599a2d21358eca3c339d5c9e0a19a0ac057bbf2db23f5ee3628d625afcd4b128b9b9041ace4f1892a0e1d2bbd0a9c677b9
+	sha512sums = 717a463d47cee1e70f210a78c6d72f64e62de36921b5805888ec48ade0cd037a250567c677b1a39243af82144d556cb708d8d79eb0b13499e75d3dc4bf533d98
 	sha512sums = b8f24df883b71df4177155246fd5858ad785f75be4f7dfc674380674b48a45342b1f5ee217a20708f74ed8d2119d837bae4a3fd48d1b62d60d55644e36411266
 
 pkgname = mattermost-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 70aeacc0caa4..07c8c9c05a37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,14 @@
 
 pkgname=mattermost-desktop
 pkgver=4.3.2
+_electronMajorVersion=5
 pkgrel=1
 pkgdesc="Mattermost Desktop application for Linux"
 arch=('i686' 'x86_64')
 url="https://github.com/mattermost/desktop"
 license=('Apache')
-depends=('electron')
-makedepends=('npm' 'git')
+depends=("electron${_electronMajorVersion}")
+makedepends=('npm' 'git' 'jq')
 source=(
     "${pkgname}-${pkgver}.tar.gz"::"${url}/archive/${pkgver}.tar.gz"
     "${pkgname}.sh"
@@ -19,7 +20,7 @@ source=(
 )
 sha512sums=(
     '40e871e0699b1e0ba7670024a368498d7477b5716ff3523ab04bb9c1567bb577cfc220071f6d0228ec2b1fdfe4caeaeba859fe47faf47c76e8f0dd135ef3cf78'
-    '7cce5fad5a923fbde106d0e67ce42d599a2d21358eca3c339d5c9e0a19a0ac057bbf2db23f5ee3628d625afcd4b128b9b9041ace4f1892a0e1d2bbd0a9c677b9'
+    '717a463d47cee1e70f210a78c6d72f64e62de36921b5805888ec48ade0cd037a250567c677b1a39243af82144d556cb708d8d79eb0b13499e75d3dc4bf533d98'
     'b8f24df883b71df4177155246fd5858ad785f75be4f7dfc674380674b48a45342b1f5ee217a20708f74ed8d2119d837bae4a3fd48d1b62d60d55644e36411266'
 )
 
@@ -34,14 +35,20 @@ prepare() {
         sed -i 's/--x64//g' package.json
     fi
 
-    # Reduce build time by removing the creation of a .deb for Debian and
-    # AppImage
-    sed -i -e '/"deb",/d' electron-builder.json
-    sed -i -e '/"appimage"/d' electron-builder.json
+    # Do not build tar.gz, nor .deb or appimages. This reduces build time.
+    jq '.linux .target |= ["dir"]' \
+        electron-builder.json > electron-builder-new.json
+    # jq cannot output to the same file it get input from.
+    mv electron-builder-new.json electron-builder.json
 
-    # No need to compress the package. Pay attention at the trailing comma: we
-    # are removing it from the JSON to makeit valid again.
-    sed -i 's/"tar.gz",/"dir"/' electron-builder.json
+    # Prepend to system electron in order to avoid an unneeded download.
+    local electronDist="/usr/lib/electron${_electronMajorVersion}"
+    local electronVersion="$(<${electronDist}/version)"
+    jq '{"electronDist": $electronDist, "electronVersion": $electronVersion} + .' \
+        --arg electronDist "$electronDist" \
+        --arg electronVersion "$electronVersion" \
+        electron-builder.json > electron-builder-new.json
+    mv electron-builder-new.json electron-builder.json
 }
 
 build() {
diff --git a/mattermost-desktop.sh b/mattermost-desktop.sh
index f96beceb8be0..a6968e8ba61f 100644
--- a/mattermost-desktop.sh
+++ b/mattermost-desktop.sh
@@ -1,2 +1,2 @@
-#!/bin/bash
-exec electron /usr/lib/mattermost-desktop/app.asar --disable-dev-mode "$@"
+#!/bin/sh
+exec electron5 /usr/lib/mattermost-desktop/app.asar --disable-dev-mode "$@"