Merge pull request #36 from Node-Virtualization/vbox5

Merge vbox5 branch for --execute

Author: michaelsanford

lib/virtualbox.js

@@ -6,6 +6,7 @@ var exec = require('child_process').exec,
   host_platform = process.platform,
   logging = require('./logging'),
   vBoxManageBinary,
+  vbox_version,
   known_OS_types = {
     WINDOWS: 'windows',
     MAC: 'mac',
@@ -32,6 +33,12 @@ if (/^win/.test(host_platform)) {
 
 }
 
+exec(vBoxManageBinary + ' --version', function(error, stdout, stderr) {
+  // e.g., "4.3.38r106717" or "5.0.20r106931"
+  vbox_version = stdout.split(".")[0];
+  logging.info("Virtualbox version detected as %s", vbox_version);
+});
+
 function command(cmd, callback) {
   exec(cmd, function(err, stdout, stderr) {
 
@@ -274,17 +281,22 @@ function vmExec(options, callback) {
 
   function getOSTypeCb(os_type) {
     var cmd = 'guestcontrol "' + vm + '"';
+    var runcmd = ' execute  --image ';
+
+    if (vbox_version == 5) {
+      runcmd = ' run ';
+    }
 
     switch (os_type) {
       case known_OS_types.WINDOWS:
         path = path.replace(/\\/g, '\\\\');
-        cmd += ' execute  --image "cmd.exe" --username ' + username + (password ? ' --password ' + password : '') + ' -- "/c" "' + path + '" "' + params + '"';
+        cmd += runcmd + ' "cmd.exe" --username ' + username + (password ? ' --password ' + password : '') + ' -- "/c" "' + path + '" "' + params + '"';
         break;
       case known_OS_types.MAC:
-        cmd += ' execute  --image "/usr/bin/open -a" --username ' + username + (password ? ' --password ' + password : '') + ' -- "/c" "' + path + '" "' + params + '"';
+        cmd += runcmd + ' "/usr/bin/open -a" --username ' + username + (password ? ' --password ' + password : '') + ' -- "/c" "' + path + '" "' + params + '"';
         break;
       case known_OS_types.LINUX:
-        cmd += ' execute  --image "/bin/sh" --username ' + username + (password ? ' --password ' + password : '') + ' -- "/c" "' + path + '" "' + params + '"';
+        cmd += runcmd + ' "/bin/sh" --username ' + username + (password ? ' --password ' + password : '') + ' -- "/c" "' + path + '" "' + params + '"';
         break;
       default:
         break;

package.json

@@ -1,14 +1,9 @@
 {
   "name": "virtualbox",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "A library to interact with VirtualBox.",
   "author": "Azer Koculu <[email protected]>",
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "https://raw.githubusercontent.com/Node-Virtualization/node-virtualbox/master/LICENSE"
-    }
-  ],
+  "license": "MIT",
   "bugs": "https://github.com/Node-Virtualization/node-virtualbox/issues",
   "contributors": [
     {
@@ -18,7 +13,7 @@
     },
     {
       "name": "Michael Sanford",
-      "url": "http://michaelsanford.com"
+      "url": "http://accidentalbeard.com"
     },
     {
       "name": "Steffen Roegner",