summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Gustafsson <fredrik@erlang.org>2013-02-28 09:39:43 +0100
committerFredrik Gustafsson <fredrik@erlang.org>2013-02-28 09:39:43 +0100
commit042c41766e393539e7facf5ae85747870e6510d1 (patch)
tree3360b6662d5745cf28b2ef229c9951c5a22e837d
parenta77a09b807bbf3f37230b150511b79beea0d65d9 (diff)
parent4f44c1f5c023e82f646c0fca1edabd7cd460fc23 (diff)
downloaderlang-042c41766e393539e7facf5ae85747870e6510d1.tar.gz
Merge branch 'mh/cdv-osx-default-browser' into master-pu
-rw-r--r--lib/observer/src/crashdump_viewer.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/observer/src/crashdump_viewer.erl b/lib/observer/src/crashdump_viewer.erl
index 3b8d17c7d9..64a8457d16 100644
--- a/lib/observer/src/crashdump_viewer.erl
+++ b/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",
[]).