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

Merge pull request #121 from kitematic/jmorgan_installer_tweaks 

Fixing minor installer bugs
This commit is contained in:
Jeffrey Morgan 2014-12-03 00:16:47 -05:00
parent 8a260ec8e0 b1e8a8a4d0
commit d13a53791c
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meteor/client/lib/setup.js
View File

@ -93,8 +93,7 @@ Setup.steps = [
callback('Boot2Docker SSH key doesn\'t exist. Fix by removing the existing Boot2Docker VM and re-run the installer. This usually occurs because an old version of Boot2Docker is installed.'); callback('Boot2Docker SSH key doesn\'t exist. Fix by removing the existing Boot2Docker VM and re-run the installer. This usually occurs because an old version of Boot2Docker is installed.');
} else { } else {
Boot2Docker.vmUpToDate(function (err, upToDate) { Boot2Docker.vmUpToDate(function (err, upToDate) {
if (err) {callback(err); return;} if (err || !upToDate) {
if (!upToDate) {
Boot2Docker.stop(function(err) { Boot2Docker.stop(function(err) {
Boot2Docker.upgrade(function (err) { Boot2Docker.upgrade(function (err) {
callback(err); callback(err);
@ -104,7 +103,7 @@ Setup.steps = [
callback(); callback();
} }
}); });
} }
} }
}); });
}, },

4
meteor/client/lib/virtualbox.js
View File

@ -16,7 +16,7 @@ VirtualBox.installed = function () {
}; };
VirtualBox.exec = function (command, callback) { VirtualBox.exec = function (command, callback) {
exec(['/usr/bin/VBoxManage', command], function (stderr, stdout, code) { exec('/usr/bin/VBoxManage ' + command, function (stderr, stdout, code) {
callback(stderr, stdout, code); callback(stderr, stdout, code);
}); });
}; };
@ -115,4 +115,4 @@ VirtualBox.shutdownVM = function (name, callback) {
}); });
}); });
}); });
}; };