From 1ba42da2a449c01d9005eb7b69cdf4b23eb67e7a Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Thu, 18 Jun 2015 12:16:04 -0700
Subject: [PATCH] Fix operating system metrics

---
 package.json             |  3 ++-
 src/utils/MetricsUtil.js | 14 ++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index bb2ed705e9..514b07481c 100644
--- a/package.json
+++ b/package.json
@@ -43,8 +43,8 @@
     "classnames": "^1.2.0",
     "coveralls": "^2.11.2",
     "deep-extend": "^0.4.0",
-    "exec": "0.2.0",
     "dockerode": "^2.1.4",
+    "exec": "0.2.0",
     "install": "^0.1.8",
     "jquery": "^2.1.3",
     "mixpanel": "0.2.0",
@@ -52,6 +52,7 @@
     "node-uuid": "^1.4.3",
     "npm": "^2.9.1",
     "object-assign": "^2.0.0",
+    "osx-release": "^1.1.0",
     "parseUri": "^1.2.3-2",
     "react": "^0.13.1",
     "react-bootstrap": "^0.20.3",
diff --git a/src/utils/MetricsUtil.js b/src/utils/MetricsUtil.js
index 8b19edfbd0..af75aeff0a 100644
--- a/src/utils/MetricsUtil.js
+++ b/src/utils/MetricsUtil.js
@@ -4,6 +4,8 @@ var uuid = require('node-uuid');
 var fs = require('fs');
 var path = require('path');
 var util = require('./Util');
+var os = require('os');
+var osxRelease = require('osx-release');
 var settings;
 
 try {
@@ -45,19 +47,11 @@ var Metrics = {
       localStorage.setItem('metrics.id', uuid.v4());
     }
 
-    var os;
-
-    if(util.isWindows()) {
-      os = navigator.userAgent;
-    } else {
-      os = navigator.userAgent.match(/Mac OS X (\d+_\d+_\d+)/)[1].replace(/_/g, '.');
-    }
-
     mixpanel.track(name, assign({
       distinct_id: id,
       version: util.packagejson().version,
-      'Operating System Version': os,
-      beta: !!settings.beta
+      'Operating System': os.platform(),
+      'Operating System Version': osxRelease(os.release())
     }, data));
   },