diff --git a/package.json b/package.json index 07ed9db51e..aa83d4d712 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "exec": "0.1.2", "jquery": "^2.1.3", "minimist": "^1.1.0", + "node-uuid": "^1.4.2", "object-assign": "^2.0.0", "react": "^0.12.2", "react-bootstrap": "^0.13.2", diff --git a/src/SetupStore.js b/src/SetupStore.js index 825c34cd59..4d6e52e05c 100644 --- a/src/SetupStore.js +++ b/src/SetupStore.js @@ -39,11 +39,13 @@ var _steps = [{ var base = util.copyBinariesCmd() + ' && ' + util.fixBinariesCmd(); if (!virtualBox.installed() || setupUtil.compareVersions(yield virtualBox.version(), packagejson['virtualbox-required-version']) < 0) { yield virtualBox.killall(); - base += ` && installer -pkg ${path.join(util.supportDir(), packagejson['virtualbox-filename'])} -target /`; + base += ` && installer -pkg ${util.escapePath(path.join(util.supportDir(), packagejson['virtualbox-filename']))} -target /`; } - var cmd = `${util.escapePath(path.join(util.resourceDir(), 'cocoasudo'))} --prompt="Kitematic requires administrative privileges to install VirtualBox." bash -c \"${base}\"`; + console.log(base); + var cmd = `${util.escapePath(path.join(util.resourceDir(), 'cocoasudo'))} --prompt="Kitematic requires administrative privileges to install VirtualBox." sudo -u root bash -c \"${base}\"`; try { - yield util.exec(cmd); + var stdout = yield util.exec(cmd); + console.log(stdout); } catch (err) { throw null; }