Merge remote-tracking branch 'origin/master' into dbkr/hak

build/entitlements.mac.plist

@@ -9,6 +9,9 @@
          Latest electron-builder does, but it appears to be causing issues:
          (https://github.com/electron-userland/electron-builder/issues/4390)
     -->
+    <!-- https://github.com/electron/electron-notarize#prerequisites -->
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
     <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
     <true/>
     <!-- https://github.com/electron-userland/electron-builder/issues/3940 -->

build/linux/after-install.tpl

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# Link to the binary
-ln -sf '/opt/${productFilename}/${executable}' '/usr/bin/${executable}'
-
-# SUID chrome-sandbox for Electron 5+
-# Remove this entire file (after-install.tpl) and remove the reference in
-# package.json once this change has been upstreamed so we go back to the copy
-# from upstream.
-# https://github.com/electron-userland/electron-builder/pull/4163
-chmod 4755 '/opt/${productFilename}/chrome-sandbox' || true
-
-update-mime-database /usr/share/mime || true
-update-desktop-database /usr/share/applications || true

package.json

@@ -34,8 +34,8 @@
   },
   "devDependencies": {
     "asar": "^2.0.1",
-    "electron-builder": "^21.2.0",
-    "electron-builder-squirrel-windows": "^21.2.0",
+    "electron-builder": "^22.3.2",
+    "electron-builder-squirrel-windows": "^22.3.2",
     "electron-devtools-installer": "^2.2.4",
     "electron-notarize": "^0.2.0",
     "eslint": "^5.8.0",
@@ -80,7 +80,6 @@
       }
     },
     "deb": {
-      "afterInstall": "build/linux/after-install.tpl",
       "fpm": [
         "--deb-custom-control=pkg/control"
       ]