build script fixes

scripts/build-native.js

@@ -4,24 +4,18 @@ const path = require('path')
 const vars = require('./vars')
 
 lifecycles = []
-lifecycles.push(rebuild({
+for (let dir of ['app', 'terminus-ssh', 'terminus-terminal']) {
-  buildPath: path.resolve(__dirname, '../app'),
+  lifecycles.push([rebuild({
-  electronVersion: vars.electronVersion,
+    buildPath: path.resolve(__dirname, '../' + dir),
-  force: true,
+    electronVersion: vars.electronVersion,
-}).lifecycle)
+    force: true,
-lifecycles.push(rebuild({
+  }).lifecycle, dir])
-  buildPath: path.resolve(__dirname, '../terminus-ssh'),
+}
-  electronVersion: vars.electronVersion,
-  force: true,
-}).lifecycle)
-lifecycles.push(rebuild({
-  buildPath: path.resolve(__dirname, '../terminus-terminal'),
-  electronVersion: vars.electronVersion,
-  force: true,
-}).lifecycle)
 
-for (let lc of lifecycles) {
+console.info('Building against Electron', vars.electronVersion)
+
+for (let [lc, dir] of lifecycles) {
   lc.on('module-found', name => {
-    console.info('Rebuilding', name)
+    console.info('Rebuilding', dir + '/' + name)
   })
 }

scripts/vars.js

@@ -3,7 +3,7 @@ const fs = require('fs')
 const childProcess = require('child_process')
 
 const appInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../app/package.json')))
-const pkgInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../package.json')))
+const electronInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../node_modules/electron/package.json')))
 
 exports.version = childProcess.execSync('git describe --tags', {encoding:'utf-8'})
 exports.version = exports.version.substring(1, exports.version.length - 1)
@@ -20,4 +20,4 @@ exports.bundledModules = [
   '@angular',
   '@ng-bootstrap',
 ]
-exports.electronVersion = pkgInfo.devDependencies.electron
+exports.electronVersion = electronInfo.version