#219: Upgrade electron to v7, get env based on app path, and use app.…

…name

app/app/index.run.js

@@ -283,7 +283,7 @@ export function runBlock($rootScope, $state, $window, $document, $translate, toa
   }];
 
   if (process.platform === 'darwin') {
-    const name = app.getName();
+    const name = app.name;
     template.unshift({
       label: name,
       submenu: [{

app/app/reports/reportsController.js

@@ -29,7 +29,7 @@ import jetpack from 'fs-jetpack';
 import os from 'os';
 import path from 'path';
 import {remote} from 'electron';
-import env from '../../env';
+import { getEnv } from '../../env';
 
 const {app} = remote;
 export class ReportsController {
@@ -43,7 +43,7 @@ export class ReportsController {
     vm.$log = $log;
     vm.$scope = $scope;
     vm.Project = Project;
-    vm.env = env;
+    vm.env = getEnv(app.getAppPath());
     vm.preloadPath = 'file://';
     vm.reportDir = Project.getProjectDir();
     vm.reportDirPath = path.resolve(vm.reportDir.path());

app/background.js

@@ -32,7 +32,7 @@
 
 import { app } from 'electron';
 import createWindow from './electron/window';
-import env from './env';
+import { getEnv } from './env';
 
 app.on('ready', () => {
 
@@ -46,6 +46,7 @@ app.on('ready', () => {
     }
   });
 
+  const env = getEnv(app.getAppPath());
   if (env.name === 'test') {
     mainWindow.loadURL('file://' + __dirname + '/spec.html');
   } else if (env.name === 'development') {

app/env.js

@@ -29,6 +29,6 @@
 
 import jetpack from 'fs-jetpack';
 
-const env = jetpack.cwd(__dirname).read('env.json', 'json');
-
-export default env;
+export function getEnv(appPath) {
+  return jetpack.cwd(appPath).read('env.json', 'json');
+}