docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Installer patch and updated package.json

This commit is contained in:
Sean Li 2015-02-13 11:53:44 -08:00
parent 99ae10ef1f
commit 318930d8a0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -55,6 +55,7 @@
"exec": "0.1.2", "exec": "0.1.2",
"jquery": "^2.1.3", "jquery": "^2.1.3",
"minimist": "^1.1.0", "minimist": "^1.1.0",
"node-uuid": "^1.4.2",
"object-assign": "^2.0.0", "object-assign": "^2.0.0",
"react": "^0.12.2", "react": "^0.12.2",
"react-bootstrap": "^0.13.2", "react-bootstrap": "^0.13.2",

8
src/SetupStore.js
View File

@ -39,11 +39,13 @@ var _steps = [{
var base = util.copyBinariesCmd() + ' && ' + util.fixBinariesCmd(); var base = util.copyBinariesCmd() + ' && ' + util.fixBinariesCmd();
if (!virtualBox.installed() || setupUtil.compareVersions(yield virtualBox.version(), packagejson['virtualbox-required-version']) < 0) { if (!virtualBox.installed() || setupUtil.compareVersions(yield virtualBox.version(), packagejson['virtualbox-required-version']) < 0) {
yield virtualBox.killall(); 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 { try {
yield util.exec(cmd); var stdout = yield util.exec(cmd);
console.log(stdout);
} catch (err) { } catch (err) {
throw null; throw null;
} }