From f54708227e0eb624dc178992c134519e42c43dfa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 5 May 2017 16:54:55 +0100
Subject: [PATCH] Proper two package.json format, release.sh bumps 2nd json ver
 too

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 electron/package.json |  6 +++++-
 package.json          | 14 ++++++++------
 release.sh            | 13 +++++++++++++
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/electron/package.json b/electron/package.json
index e6e7e2a4..0fff99f5 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -1,5 +1,9 @@
 {
-  "description": "Electron main process dependencies",
+  "name": "riot-web",
+  "main": "src/electron-main.js",
+  "version": "0.0.0",
+  "description": "A feature-rich client for Matrix.org",
+  "author": "Vector Creations Ltd.",
   "dependencies": {
     "electron-window-state": "^4.1.0"
   }
diff --git a/package.json b/package.json
index a64d0d9e..e801ed5d 100644
--- a/package.json
+++ b/package.json
@@ -146,11 +146,12 @@
     "dereference": true,
     "//files": "We bundle everything, so we only need to include webapp/",
     "files": [
-      "electron/node_modules/**",
-      "electron/src/**",
-      "electron/img/**",
-      "webapp/**",
-      "package.json"
+      "node_modules/**",
+      "src/**",
+      "img/**"
+    ],
+    "extraResources": [
+      "webapp/**/*"
     ],
     "linux": {
       "target": "deb",
@@ -164,7 +165,8 @@
     },
     "directories": {
       "buildResources": "electron/build",
-      "output": "electron/dist"
+      "output": "electron/dist",
+      "app": "electron"
     }
   }
 }
diff --git a/release.sh b/release.sh
index e8c68b90..a3225150 100755
--- a/release.sh
+++ b/release.sh
@@ -9,4 +9,17 @@ set -e
 
 cd `dirname $0`
 
+
+# bump Electron's package.json first
+release="${1#v}"
+tag="v${release}"
+echo "electron npm version"
+
+cd electron
+npm version --no-git-tag-version "$release"
+git commit package.json -m "$tag"
+
+
+cd ..
+
 exec ./node_modules/matrix-js-sdk/release.sh -z "$@"