Set up darwin detectors in index.js

james-proxy · Feb 29, 2016 · 5209a62 · 5209a62
1 parent d71fa27
commit 5209a62
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 36 deletions.
diff --git a/lib/darwin/canary.js b/lib/darwin/canary.js
diff --git a/lib/darwin/chrome.js b/lib/darwin/chrome.js
diff --git a/lib/darwin/chromium.js b/lib/darwin/chromium.js
diff --git a/lib/darwin/index.js b/lib/darwin/index.js
@@ -1,6 +1,15 @@
-exports.safari = require( './safari' );
+var util = require('./util');
+
+function browser(id, versionKey) {
+    return {
+        path: util.find.bind(null, id),
+        version: util.getInfoKey(null, id, versionKey)
+    };
+}
+
+exports.safari = browser('com.apple.Safari', 'CFBundleShortVersionString');
 exports.firefox = require( './firefox' );
-exports.chrome = exports[ 'google-chrome' ] = require( './chrome' );
-exports.chromium = require( './chromium' );
-exports.canary = exports[ 'chrome-canary' ] = exports[ 'google-chrome-canary' ] = require( './canary' );
-exports.opera = require( './opera' );
+exports.chrome = exports[ 'google-chrome' ] = browser('com.google.Chrome', 'KSVersion');
+exports.chromium = browser('org.chromium.Chromium', 'CFBundleShortVersionString');
+exports.canary = exports[ 'chrome-canary' ] = exports[ 'google-chrome-canary' ] = browser('com.google.Chrome.canary', 'KSVersion');
+exports.opera = browser('com.operasoftware.Opera', 'CFBundleVersion');
diff --git a/lib/darwin/opera.js b/lib/darwin/opera.js
diff --git a/lib/darwin/safari.js b/lib/darwin/safari.js
diff --git a/lib/darwin/util.js b/lib/darwin/util.js
@@ -72,4 +72,4 @@ function getInfoKey(bundleId, key, callback) {
             callback(null, data[key]);
         });
     });
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,4 +72,4 @@ function getInfoKey(bundleId, key, callback) { @@
                 callback(null, data[key]);
             });
         });
-    }
+    }