Merge pull request #78 from colonelpopcorn/issue71

Fix OS callback

Author: colonelpopcorn

.jshintrc

@@ -21,7 +21,12 @@
   "predef"        : [  // Extra globals.
     "require",
     "define",
-    "notify"
+    "notify",
+    "expect",
+    "it",
+    "afterEach",
+    "describe",
+    "jest"
   ],
 
 

.travis.yml

@@ -7,9 +7,10 @@ node_js:
   - "12"
   - "11"
   - "10"
- before_install:
-  - npm install -g jshint
+before_install:
+  - npm install -g jshint jest
 install:
   - npm install
 script:
   - npm test
+  - npm run lint

lib/virtualbox.js

@@ -2,19 +2,18 @@
 
 // @todo use a promise library instead of so many callbacks
 
-var execFile = require('child_process').execFile,
+const execFile = require('child_process').execFile,
   host_platform = process.platform,
   logging = require('./logging'),
-  vBoxManageBinary,
-  vbox_version,
-  known_OS_types = {
+   known_OS_types = {
     WINDOWS: 'windows',
     MAC: 'mac',
     LINUX: 'linux'
-  },
-  allowedBinaries = ["VBoxControl", vBoxManageBinary];
-
+  };
 
+let vBoxManageBinary,
+  vbox_version;
+ 
 
 // Host operating system
 if (/^win/.test(host_platform)) {
@@ -35,6 +34,10 @@ if (/^win/.test(host_platform)) {
 
 }
 
+const 
+  allowedBinaries = ["VBoxControl", vBoxManageBinary];
+
+
 execFile(vBoxManageBinary, ["--version"], function(error, stdout, stderr) {
   // e.g., "4.3.38r106717" or "5.0.20r106931"
   vbox_version = stdout.split(".")[0];
@@ -429,7 +432,7 @@ var guestproperty = {
       // The ostype is matched against the ID attribute of 'vboxmanage list ostypes'
       if (stdout.indexOf('ostype="Windows') !== -1) {
         guestproperty.os_type = known_OS_types.WINDOWS;
-      } else if (stdout.indexOf('ostype="MacOS') !== -1) {
+      } else if (['ostype="MacOS', 'ostype="Mac OS machine'].includes(stdout)) {
         guestproperty.os_type = known_OS_types.MAC;
       } else {
         guestproperty.os_type = known_OS_types.LINUX;
@@ -443,8 +446,9 @@ var guestproperty = {
     }
 
     try {
-      vboxmanage('showvminfo', '--machinereadable', vmname, getOSTypeCallback);
+      vboxmanage(['showvminfo', '--machinereadable', vmname], getOSTypeCallback);
     } catch (e) {
+      logging.error(e);
       logging.info('Could not showvminfo for %s', vmname);
     }
   }