Skip to content
Browse files

Merge branch 'mh/cdv-osx-default-browser/OTP-10929' into maint

* mh/cdv-osx-default-browser/OTP-10929:
  Added open on mac os to doc
  Use "open" as default browser for crashdump viewer on Mac OS X
  • Loading branch information...
2 parents 5bc09c6 + b088690 commit fbc6a824d8f9450087b2184c9ce6d03ef65da832 @gustehn gustehn committed Mar 12, 2013
Showing with 5 additions and 4 deletions.
  1. +2 −2 lib/observer/doc/src/crashdump_ug.xml
  2. +3 −2 lib/observer/src/crashdump_viewer.erl
View
4 lib/observer/doc/src/crashdump_ug.xml
@@ -48,8 +48,8 @@
Information which shows a short summary of the information in
the crashdump.</p>
- <p>The default browser is Internet Explorer on Windows or else
- Firefox. To use another browser, give the browser's start command
+ <p>The default browser is Internet Explorer on Windows, open on Mac OS X,
+ or else Firefox. To use another browser, give the browser's start command
as the second argument to <c>cdv</c>. If the given browser name is
not known to Crashdump Viewer, the browser argument is executed as
a command with the start URL as the only argument.</p>
View
5 lib/observer/src/crashdump_viewer.erl
@@ -214,6 +214,7 @@ script_start([File]) ->
DefaultBrowser =
case os:type() of
{win32,_} -> iexplore;
+ {unix,darwin} -> open;
_ -> firefox
end,
script_start([File,DefaultBrowser]);
@@ -277,8 +278,8 @@ usage() ->
io:format(
"\nusage: cdv file [ browser ]\n"
"\tThe \'file\' must be an existing erlang crash dump.\n"
- "\tDefault browser is \'iexplore\' (Internet Explorer) on Windows\n"
- "\tor else \'firefox\'.\n",
+ "\tDefault browser is \'iexplore\' (Internet Explorer) on Windows,\n"
+ "\t\'open\' on Mac OS X, or else \'firefox\'.\n",
[]).

0 comments on commit fbc6a82

Please sign in to comment.
Something went wrong with that request. Please try again.