From dc74ad5d13edda7cffc976a4539854fe9cd287ad Mon Sep 17 00:00:00 2001
From: whphhg <whphhg@protonmail.ch>
Date: Sun, 21 May 2017 15:48:52 +0200
Subject: [PATCH] README: Update with macOS packaging, minor changes

---
 README.md         | 26 +++++++++++++++++++-------
 bin/README.md     |  2 +-
 package.json      |  5 +++--
 src/electron.js   | 14 ++------------
 src/stores/rpc.js |  8 +-------
 5 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 5f2a6f4..06cf855 100644
--- a/README.md
+++ b/README.md
@@ -28,10 +28,7 @@ using `npm run dev` or `npm run dev-win` on Windows.
     $ npm run dev (Linux and macOS)
     $ npm run dev-win (Windows)
 
-## Package and build for Linux and Windows
-The following dependencies are required to be installed:
-* docker (make sure your user is in the docker group)
-
+## Package and build
 To bundle the daemon with the GUI, name it `vcashd-arch`, where `arch` can
 be either `ia32` or `x64` and place it into the `bin` directory. This directory
 is checked for the current platform & arch daemon executable on start-up by
@@ -46,6 +43,10 @@ actually packaging the GUI run `npm run pack`.
 
     $ npm run pack
 
+### Linux and Windows (using Docker)
+The following dependencies are required to be installed:
+* docker (make sure your user is in the docker group)
+
 Run the docker container.
 
     $ docker run --rm -ti -v ${PWD}:/project -v ${PWD##*/}-node-modules:/project/node_modules -v ~/.electron:/root/.electron electronuserland/electron-builder:wine
@@ -68,12 +69,23 @@ dist-win32-x64 | x64 | Create a 64-bit Windows portable executable
 `vcashd-ia32.exe` and `vcashd-x64.exe` in the `bin` directory. Other scripts
 require only the daemon for the target arch of the platform they're packaging for.
 
+## Linux and macOS
+To package in a distributable format run one of the scripts from the table
+below, which will create the packages for your current platform and save
+them into the `dist` directory. Packages will be created according to the
+`build` and `scripts` options in
+[package.json](https://github.com/whphhg/vcash-electron/blob/master/package.json#L11-L33).
+
+    $ npm run <script>
+
+Script | Target arch | Description
+------ | ------ | ------
+dist-linux | x64 | Create 64-bit Linux .deb and .zip packages
+dist-mac | x64 | Create 64-bit macOS .dmg package
+
 You can read more about the `electron-builder` options
 [here](https://github.com/electron-userland/electron-builder/wiki/Options).
 
-## Package and build for macOS
-WIP
-
 ## License
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/bin/README.md b/bin/README.md
index e42860e..068aebf 100644
--- a/bin/README.md
+++ b/bin/README.md
@@ -1,5 +1,5 @@
 # Daemons
-Placing a daemon executable named `vcashd-arch`, where `arch` can be either
+Placing a daemon named `vcashd-arch`, where `arch` can be either
 `ia32` or `x64` into this directory will spawn it on start-up if it matches
 the correct platform and arch. It will also get bundled with the GUI when
 you run any of the `npm run dist-` scripts.
diff --git a/package.json b/package.json
index 1698644..2ffeff6 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "dev-win": "set NODE_ENV=dev&&electron .",
     "pack": "build --dir",
     "dist-linux": "build --linux --x64",
+    "dist-mac": "build --mac --x64",
     "dist-nsis": "build --win nsis --ia32 --x64",
     "dist-win32-x64": "build --win portable --x64",
     "dist-win32-ia32": "build --win portable --ia32"
@@ -52,7 +53,7 @@
   "dependencies": {
     "antd": "2.10.1",
     "electron-compile": "6.4.1",
-    "i18next": "8.2.1",
+    "i18next": "8.3.0",
     "i18next-node-fs-backend": "1.0.0",
     "mobx": "3.1.9",
     "mobx-logger": "0.5.0",
@@ -74,7 +75,7 @@
     "babel-preset-react": "6.24.1",
     "babel-preset-stage-0": "6.24.1",
     "babel-runtime": "6.23.0",
-    "electron-builder": "17.8.0",
+    "electron-builder": "17.10.0",
     "electron-prebuilt-compile": "1.7.0",
     "standard": "10.0.2"
   }
diff --git a/src/electron.js b/src/electron.js
index 31163b7..32fcb8d 100644
--- a/src/electron.js
+++ b/src/electron.js
@@ -42,22 +42,12 @@ app.on('ready', () => {
       daemon.kill('SIGINT')
     }
 
-    /**
-     * Dereference the window object, usually you would store windows
-     * in an array if your app supports multi windows, this is the time
-     * when you should delete the corresponding element.
-     */
+    /** Dereference the window object. */
     mainWindow = null
   })
 })
 
 /** All of the windows are closed. */
 app.on('window-all-closed', () => {
-  /**
-   * On macOS it is common for applications and their menu bar
-   * to stay active until the user quits explicitly with Cmd + Q.
-   */
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
+  app.quit()
 })
diff --git a/src/stores/rpc.js b/src/stores/rpc.js
index 922c08b..baa54c3 100644
--- a/src/stores/rpc.js
+++ b/src/stores/rpc.js
@@ -65,13 +65,7 @@ export default class RPC {
         body: JSON.stringify(options)
       })
       .then((response) => {
-        if (response.ok === true) {
-          try {
-            return response.json()
-          } catch (e) {
-            console.error('Received RPC response with invalid characters.', e)
-          }
-        }
+        if (response.ok === true) return response.json()
       })
       .then((data) => {
         /** Update connection status. */