chore: Revert electron-builder (#1552)

wireapp · Jun 19, 2018 · 6763f6d · 6763f6d
1 parent baaf586
commit 6763f6d
Show file tree

Hide file tree

Showing 6 changed files with 559 additions and 1,545 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -27,18 +27,13 @@ const ELECTRON_PACKAGE_JSON = 'electron/package.json';
 const PACKAGE_JSON = 'package.json';
 const INFO_JSON = 'info.json';
 
-const LINUX_SETTINGS = {
-  afterInstall: 'bin/deb/after-install.tpl',
-  afterRemove: 'bin/deb/after-remove.tpl',
-  category: 'Network',
-  desktop: {
-    Version: '<%= info.version %>.<%= buildNumber %>',
-    Name: '<%= info.name %>',
-    GenericName: '<%= info.description %>',
-    Categories: 'Network;InstantMessaging;Chat;VideoConference',
-    Keywords: 'chat;encrypt;e2e;messenger;videocall',
-    StartupWMClass: '<%= info.name %>',
-  },
+const LINUX_DESKTOP = {
+  Version: '1.1',
+  Name: 'Wire',
+  GenericName: 'The most secure collaboration platform',
+  Categories: 'Network;InstantMessaging;Chat;VideoConference',
+  Keywords: 'chat;encrypt;e2e;messenger;videocall',
+  StartupWMClass: 'Wire',
 };
 
 module.exports = function(grunt) {
@@ -154,52 +149,54 @@ module.exports = function(grunt) {
 
       linux_prod: {
         options: {
+          productName: 'wire-desktop',
+          targets: ['deb', 'rpm', 'AppImage'],
+          linux: {
+            fpm: ['--name', 'wire-desktop'],
+            executableName: 'wire-desktop',
+            desktop: LINUX_DESKTOP,
+            afterInstall: 'bin/deb/after-install.tpl',
+            afterRemove: 'bin/deb/after-remove.tpl',
+          },
           deb: {
-            ...LINUX_SETTINGS,
             depends: ['libappindicator1', 'libasound2', 'libgconf-2-4', 'libnotify-bin', 'libnss3', 'libxss1'],
           },
-          linux: {
-            category: 'Network',
-          },
-          productName: 'wire-desktop',
           rpm: {
-            ...LINUX_SETTINGS,
             depends: ['alsa-lib', 'Gconf2', 'libappindicator', 'libnotify', 'libXScrnSaver', 'libXtst', 'nss'],
-            fpm: ['--name', 'wire-desktop'],
           },
-          targets: ['deb', 'rpm', 'AppImage'],
         },
       },
 
       linux_internal: {
         options: {
+          productName: 'wire-desktop-internal',
+          targets: ['deb', 'rpm', 'AppImage'],
+          linux: {
+            fpm: ['--name', 'wire-desktop-internal'],
+            executableName: 'wire-desktop-internal',
+            afterInstall: 'bin/deb/after-install.tpl',
+            afterRemove: 'bin/deb/after-remove.tpl',
+            desktop: {...LINUX_DESKTOP, Name: 'WireInternal', StartupWMClass: 'WireInternal'},
+          },
           deb: {
-            ...LINUX_SETTINGS,
             depends: ['libappindicator1', 'libasound2', 'libgconf-2-4', 'libnotify-bin', 'libnss3', 'libxss1'],
           },
-          linux: {
-            category: 'Network',
-          },
-          productName: 'wire-desktop-internal',
           rpm: {
-            ...LINUX_SETTINGS,
             depends: ['alsa-lib', 'Gconf2', 'libappindicator', 'libnotify', 'libXScrnSaver', 'libXtst', 'nss'],
-            fpm: ['--name', 'wire-desktop-internal'],
           },
-          targets: ['deb', 'rpm', 'AppImage'],
         },
       },
 
       linux_other: {
         options: {
           arch: `${grunt.option('arch') || process.arch}`,
+          productName: 'wire-desktop',
+          targets: [`${grunt.option('target') || 'dir'}`],
           linux: {
-            category: 'Network',
-            ...LINUX_SETTINGS,
             fpm: ['--name', 'wire-desktop'],
+            executableName: 'wire-desktop',
+            desktop: LINUX_DESKTOP,
           },
-          productName: 'wire-desktop',
-          targets: [`${grunt.option('target') || 'dir'}`],
         },
       },
     },
@@ -313,8 +310,9 @@ module.exports = function(grunt) {
 
   grunt.registerMultiTask('electronbuilder', 'Build Electron apps', function() {
     const options = this.options();
-    const {arch, targets} = options;
+    const {targets} = options;
     delete options.targets;
+    const {arch} = options;
     delete options.arch;
 
     const done = this.async();