Merge branch 'master' of https://github.com/alexturpin/browser-sync into alexturpin

Author: shakyShane

lib/internal-events.js

@@ -42,7 +42,7 @@ module.exports = function (bs) {
             var open = bs.options.get("open");
 
             if (mode === "proxy" || mode === "server" || open === "ui" || open === "ui-external") {
-                utils.openBrowser(data.url, bs.options);
+                utils.openBrowser(data.url, bs.options, bs);
             }
 
             // log about any file watching

lib/logger.js

@@ -67,6 +67,12 @@ module.exports.callbacks = {
             logger.info("{cyan:Reloading Browsers...");
         }
     },
+    /**
+     *
+     */
+    "browser:error": function () {
+        logger.error("Couldn't open browser (if you are using BrowserSync in a headless environment, you might want to set the {cyan:open} option to {cyan:false})");
+    },
     /**
      * @param {BrowserSync} bs
      * @param data

lib/utils.js

@@ -140,7 +140,7 @@ var utils = {
      * @param {String} url
      * @param {Object} options
      */
-    openBrowser: function (url, options) {
+    openBrowser: function (url, options, bs) {
 
         var open    = options.get("open");
         var browser = options.get("browser");
@@ -155,13 +155,13 @@ var utils = {
             if (browser !== "default") {
                 if (utils.isList(browser)) {
                     browser.forEach(function (browser) {
-                        utils.open(url, browser);
+                        utils.open(url, browser, bs);
                     });
                 } else {
-                    utils.open(url, browser); // single
+                    utils.open(url, browser, bs); // single
                 }
             } else {
-                utils.open(url);
+                utils.open(url, null, bs);
             }
         }
     },
@@ -170,7 +170,7 @@ var utils = {
      * @param url
      * @param name
      */
-    open: function (url, name) {
+    open: function (url, name, bs) {
         var options = (function () {
             if (_.isString(name)) {
                 return {app: name};
@@ -180,7 +180,10 @@ var utils = {
             }
             return {};
         })();
-        require("opn")(url, options);
+        var opn = require("opn");
+        opn(url, options).catch(function() {
+            bs.events.emit("browser:error");
+        });
     },
     /**
      * @param {Boolean} kill