From c226671577dd5172246f0f2fcad1fed07f4a44b5 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 8 Oct 2015 13:42:43 -0400 Subject: [PATCH] Review comments Signed-off-by: Jeffrey Morgan --- src/menutemplate.js | 17 ++++++++--------- src/stores/SetupStore.js | 2 +- src/utils/SetupUtil.js | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/menutemplate.js b/src/menutemplate.js index 2954323d99..dbd99b3c38 100644 --- a/src/menutemplate.js +++ b/src/menutemplate.js @@ -1,13 +1,12 @@ -var remote = require('remote'); +import remote from 'remote'; +import shell from 'shell'; +import router from './router'; +import util from './utils/Util'; +import metrics from './utils/MetricsUtil'; +import machine from './utils/DockerMachineUtil'; +import docker from './utils/DockerUtil'; + var app = remote.require('app'); -var shell = require('shell'); -var router = require('./router'); -var util = require('./utils/Util'); -var setupUtil = require('./utils/SetupUtil'); -var metrics = require('./utils/MetricsUtil'); -var machine = require('./utils/DockerMachineUtil'); -var docker = require('./utils/DockerUtil'); -var dialog = remote.require('dialog'); // main.js var MenuTemplate = function () { diff --git a/src/stores/SetupStore.js b/src/stores/SetupStore.js index fe6688649c..89c340ba65 100644 --- a/src/stores/SetupStore.js +++ b/src/stores/SetupStore.js @@ -15,7 +15,7 @@ class SetupStore { } progress ({progress}) { - this.setState({error: null, progress}) + this.setState({error: null, progress}); } } diff --git a/src/utils/SetupUtil.js b/src/utils/SetupUtil.js index 9e2d069adf..4f26be95b4 100644 --- a/src/utils/SetupUtil.js +++ b/src/utils/SetupUtil.js @@ -54,7 +54,7 @@ export default { await util.exec(setupUtil.macSudoCmd(util.escapePath('/Library/Application Support/VirtualBox/LaunchDaemons/VirtualBoxStartup.sh') + ' restart')); } - let exists = await virtualBox.vmExists('default'); + let exists = await virtualBox.vmExists(machine.name()); if (!exists) { router.get().transitionTo('setup'); this.simulateProgress(60);