From 2711a2b6c6268119f6b2c43f0dede3da55635bbe Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 14 Feb 2018 23:53:52 -0500
Subject: [PATCH] more building

---
 package.json                             |  49 ++++++++++++++++-------
 resources/{icon => icons}/128x128.png    | Bin
 resources/{icon => icons}/128x128@2x.png | Bin
 resources/{icon => icons}/16x16.png      | Bin
 resources/{icon => icons}/16x16@2x.png   | Bin
 resources/{icon => icons}/256x256.png    | Bin
 resources/{icon => icons}/32x32.png      | Bin
 resources/{icon => icons}/32x32@2x.png   | Bin
 resources/{icon => icons}/48x48.png      | Bin
 resources/{icon => icons}/64x64.png      | Bin
 resources/{icon => icons}/64x64@2x.png   | Bin
 11 files changed, 35 insertions(+), 14 deletions(-)
 rename resources/{icon => icons}/128x128.png (100%)
 rename resources/{icon => icons}/128x128@2x.png (100%)
 rename resources/{icon => icons}/16x16.png (100%)
 rename resources/{icon => icons}/16x16@2x.png (100%)
 rename resources/{icon => icons}/256x256.png (100%)
 rename resources/{icon => icons}/32x32.png (100%)
 rename resources/{icon => icons}/32x32@2x.png (100%)
 rename resources/{icon => icons}/48x48.png (100%)
 rename resources/{icon => icons}/64x64.png (100%)
 rename resources/{icon => icons}/64x64@2x.png (100%)

diff --git a/package.json b/package.json
index d4a3753dee..498a382ebc 100644
--- a/package.json
+++ b/package.json
@@ -19,12 +19,17 @@
   "scripts": {
     "lint": "tslint src/**/*.ts || true",
     "lint:fix": "tslint src/**/*.ts --fix",
+    "build": "npm run build:main | npm run build:renderer",
     "build:main": "webpack --config webpack.main.js",
     "build:renderer": "webpack --config webpack.renderer.js",
     "build:renderer:watch": "webpack --config webpack.renderer.js --watch",
     "electron": "npm run build:main && (electron --inspect=5858 ./build --watch | npm run build:renderer:watch)",
-    "pack": "electron-builder --dir",
-    "dist": "electron-builder"
+    "pack:linux": "build --linux --x64",
+    "pack:mac": "build --mac",
+    "pack:win": "build --win --x64 --ia32",
+    "dist:linux": "npm run build && npm run pack:linux",
+    "dist:mac": "npm run build && npm run pack:mac",
+    "dist:win": "npm run build && npm run pack:win"
   },
   "build": {
     "appId": "com.bitwarden.desktop",
@@ -35,7 +40,28 @@
       "app": "build"
     },
     "mac": {
-      "category": "public.app-category.productivity"
+      "category": "public.app-category.productivity",
+      "target": [ 
+        "dmg",
+        "zip"
+      ]
+    },
+    "win": { 
+      "target": [ 
+        "portable",
+        "nsis"
+      ],
+      "electronUpdaterCompatibility": ">=0.0.1"
+    },
+    "linux": {
+      "target": [
+        "snap",
+        "rpm",
+        "AppImage",
+        "deb"
+      ],
+      "category": "Utility",
+      "synopsis": "A secure and free password manager for all of your devices."
     },
     "dmg": {
       "background": "./resources/background.png",
@@ -58,17 +84,12 @@
       }
     },
     "nsis": {
-      "perMachine": true
-    },
-    "linux": {
-      "target": [
-        "snap",
-        "rpm",
-        "AppImage",
-        "deb"
-      ],
-      "category": "Utility",
-      "synopsis": "A secure and free password manager for all of your devices."
+      "oneClick": false,
+      "perMachine": true,
+      "allowToChangeInstallationDirectory": true,
+      "uninstallDisplayName": "${productName}",
+      "artifactName": "${productName} Setup.${ext}",
+      "deleteAppDataOnUninstall": true
     }
   },
   "devDependencies": {
diff --git a/resources/icon/128x128.png b/resources/icons/128x128.png
similarity index 100%
rename from resources/icon/128x128.png
rename to resources/icons/128x128.png
diff --git a/resources/icon/128x128@2x.png b/resources/icons/128x128@2x.png
similarity index 100%
rename from resources/icon/128x128@2x.png
rename to resources/icons/128x128@2x.png
diff --git a/resources/icon/16x16.png b/resources/icons/16x16.png
similarity index 100%
rename from resources/icon/16x16.png
rename to resources/icons/16x16.png
diff --git a/resources/icon/16x16@2x.png b/resources/icons/16x16@2x.png
similarity index 100%
rename from resources/icon/16x16@2x.png
rename to resources/icons/16x16@2x.png
diff --git a/resources/icon/256x256.png b/resources/icons/256x256.png
similarity index 100%
rename from resources/icon/256x256.png
rename to resources/icons/256x256.png
diff --git a/resources/icon/32x32.png b/resources/icons/32x32.png
similarity index 100%
rename from resources/icon/32x32.png
rename to resources/icons/32x32.png
diff --git a/resources/icon/32x32@2x.png b/resources/icons/32x32@2x.png
similarity index 100%
rename from resources/icon/32x32@2x.png
rename to resources/icons/32x32@2x.png
diff --git a/resources/icon/48x48.png b/resources/icons/48x48.png
similarity index 100%
rename from resources/icon/48x48.png
rename to resources/icons/48x48.png
diff --git a/resources/icon/64x64.png b/resources/icons/64x64.png
similarity index 100%
rename from resources/icon/64x64.png
rename to resources/icons/64x64.png
diff --git a/resources/icon/64x64@2x.png b/resources/icons/64x64@2x.png
similarity index 100%
rename from resources/icon/64x64@2x.png
rename to resources/icons/64x64@2x.png