Firefox can use util

james-proxy · Feb 29, 2016 · 79fb2f5 · 79fb2f5
1 parent c59c7ea
commit 79fb2f5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 72 deletions.
diff --git a/lib/darwin/firefox.js b/lib/darwin/firefox.js
diff --git a/lib/darwin/index.js b/lib/darwin/index.js
@@ -8,7 +8,7 @@ function browser(id, versionKey) {
 }
 
 exports.safari = browser('com.apple.Safari', 'CFBundleShortVersionString');
-exports.firefox = require( './firefox' );
+exports.firefox = browser('org.mozilla.firefox', 'CFBundleShortVersionString');
 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');

diff --git a/lib/detect.js b/lib/detect.js
@@ -92,29 +92,19 @@ function detectWindows( callback ) {
  */
 function checkDarwin( name, callback ) {
 	if ( darwin[ name ] ) {
-		if ( darwin[ name ].all ) {
-			darwin[ name ].all( function( err, available ) {
-				if ( err ) {
-					callback( 'failed to get version for ' + name );
-				} else {
-					callback( err, available );
-				}
-			} );
-		} else {
-			darwin[ name ].version( function( err, version ) {
-				if ( version ) {
-					darwin[ name ].path( function( err, p ) {
-						if ( err ) {
-							return callback( 'failed to get path for ' + name );
-						}
-
-						callback( null, version, p );
-					} );
-				} else {
-					callback( 'failed to get version for ' + name );
-				}
-			} );
-		}
+		darwin[ name ].version( function( err, version ) {
+			if ( version ) {
+				darwin[ name ].path( function( err, p ) {
+					if ( err ) {
+						return callback( 'failed to get path for ' + name );
+					}
+
+					callback( null, version, p );
+				} );
+			} else {
+				callback( 'failed to get version for ' + name );
+			}
+		} );
 	} else {
 		checkOthers( name, callback );
 	}
@@ -190,19 +180,10 @@ module.exports = function detect( callback ) {
 
 		check( name, function( err, v, p ) {
 			if ( err === null ) {
-				if ( Array.isArray( v ) ) {
-					v.forEach( function( item ) {
-						available.push( extend( {}, br, {
-							command: item.path,
-							version: item.version
-						} ) );
-					} );
-				} else {
-					available.push( extend( {}, br, {
-						command: p || name,
-						version: v
-					} ) );
-				}
+				available.push( extend( {}, br, {
+					command: p || name,
+					version: v
+				} ) );
 			}
 
 			next();