From 442e0dfa64af3b416ad29827004b845753846f6d Mon Sep 17 00:00:00 2001
From: unknown <xnerhu@gmail.com>
Date: Sat, 27 Oct 2018 20:35:37 +0200
Subject: [PATCH 1/2] Fix file associations

Former-commit-id: bafb482edb884c2011afee4a0e9c5b0783862945 [formerly bafb482edb884c2011afee4a0e9c5b0783862945 [formerly ec1f4f5912d4831c79b40efeb62b2dfa71658af3]]
Former-commit-id: 87998883e132d7debb8a0be2f6b4da31e2bc2522
Former-commit-id: 85c6c5b0690deec1d6b38cb5196a3d3754ff462b
---
 electron-builder.json | 13 ++++++++-----
 package.json          |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/electron-builder.json b/electron-builder.json
index b035705e3..50601aca9 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -26,9 +26,12 @@
   "mac": {
     "category": "public.app-category.navigation"
   },
-  "fileAssociations": {
-    "ext": [".html"],
-    "description": "Wexond",
-    "role": "Viewer"
-  }
+  "fileAssociations": [
+    {
+      "name": "Document",
+      "description": "Wexond",
+      "role": "Viewer",
+      "ext": "html"
+    }
+  ]
 }
diff --git a/package.json b/package.json
index 2a1d266a7..e86230164 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "compile-win32": "npm run build && electron-builder -w -p always",
     "compile-darwin": "npm run build && electron-builder -m -p always",
     "compile-linux": "npm run build && electron-builder -l -p always",
+    "x": "electron-builder -w -p always",
     "lint": "tslint \"src/**/*.ts*\"",
     "lint-fix": "prettier --write \"src/**/*.ts*\" && tslint \"src/**/*.ts*\" --fix",
     "postinstall": "electron-builder install-app-deps",

From 9706d064abe30bfc703f44fd9cb67911cf1b04ad Mon Sep 17 00:00:00 2001
From: unknown <xnerhu@gmail.com>
Date: Sat, 27 Oct 2018 20:36:11 +0200
Subject: [PATCH 2/2] Update package.json

Former-commit-id: a7a63e58f2b9dee935bdb081759dc46acab2d014 [formerly a7a63e58f2b9dee935bdb081759dc46acab2d014 [formerly de386fb70b8b776b2f2147591d89ff46ead79962]]
Former-commit-id: 3f3514a11f82f15639210395c2d18f9952270df2
Former-commit-id: be905bc510096378d702719ae1efed1dfee11df9
---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 8b7159980..7023ac3b5 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,6 @@
     "compile-win32": "npm run build && electron-builder -w -p always",
     "compile-darwin": "npm run build && electron-builder -m -p always",
     "compile-linux": "npm run build && electron-builder -l -p always",
-    "x": "electron-builder -w -p always",
     "lint": "tslint \"src/**/*.ts*\"",
     "lint-fix": "prettier --write \"src/**/*.ts*\" && tslint \"src/**/*.ts*\" --fix",
     "postinstall": "electron-builder install-app-deps",