Adds default location for MacOS browsers. Should close #1

bitovi · Nov 17, 2012 · ec221eb · ec221eb
1 parent 37cb845
commit ec221eb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/bin/launchpad b/bin/launchpad
diff --git a/examples/allBrowsersTest.js b/examples/allBrowsersTest.js
diff --git a/examples/browserstack.js b/examples/browserstack.js
diff --git a/examples/local.js b/examples/local.js
diff --git a/lib/local/platform/macos.js b/lib/local/platform/macos.js
@@ -3,6 +3,7 @@ var plist = require('plist');
 var path = require('path');
 var async = require('async');
 var _ = require('underscore');
+var fs = require('fs');
 
 var supportedBrowsers = exports.supported = [
 	{
@@ -11,23 +12,26 @@ var supportedBrowsers = exports.supported = [
 		plistPath : 'Contents/Info.plist',
 		command : 'open',
 		process : 'Google Chrome',
-		versionKey : 'KSVersion'
+		versionKey : 'KSVersion',
+		defaultLocation : '/Applications/Google Chrome.app'
 	},
 	{
 		name : 'firefox',
 		pathQuery : 'mdfind \'kMDItemDisplayName == "Firefox" && kMDItemKind == Application\'',
 		plistPath : 'Contents/Info.plist',
 		command : 'open',
 		process : 'firefox',
-		versionKey : 'CFBundleGetInfoString'
+		versionKey : 'CFBundleGetInfoString',
+		defaultLocation : '/Applications/Firefox.app'
 	},
 	{
 		name : 'opera',
 		pathQuery : 'mdfind \'kMDItemDisplayName == "Opera" && kMDItemKind == Application\'',
 		plistPath : 'Contents/Info.plist',
 		command : 'open',
 		process : 'Opera',
-		versionKey : 'CFBundleShortVersionString'
+		versionKey : 'CFBundleShortVersionString',
+		defaultLocation : '/Applications/Opera.app'
 	},
 	{
 		name : 'phantom',
@@ -41,7 +45,8 @@ var supportedBrowsers = exports.supported = [
 		plistPath : 'Contents/version.plist',
 		command : 'open',
 		process : 'Safari',
-		versionKey : 'CFBundleShortVersionString'
+		versionKey : 'CFBundleShortVersionString',
+		defaultLocation : '/Applications/Safari.app'
 	}
 ];
 
@@ -53,6 +58,10 @@ var browsers = supportedBrowsers.map(function (browser) {
 			if (err) return callback(err);
 
 			if (!stdout.length) {
+				// Not found using mdfind, let's see if the standard path exists
+				if(browser.defaultLocation && fs.existsSync(browser.defaultLocation)) {
+					return callback(null, browser.defaultLocation);
+				}
 				return callback(null, null);
 			}