diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-03-12 09:53:25 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-03-12 09:53:25 +0100 |
| commit | fbc6a824d8f9450087b2184c9ce6d03ef65da832 (patch) | |
| tree | 4e8cbfcf4bb14fbfcfa293f24406829c0e7a6c97 | |
| parent | 5bc09c6e23f05d8e784af8b79f710d97f345c773 (diff) | |
| parent | b0886901b568432c4cd56831ca3121c920d74097 (diff) | |
| download | otp-fbc6a824d8f9450087b2184c9ce6d03ef65da832.tar.gz otp-fbc6a824d8f9450087b2184c9ce6d03ef65da832.tar.bz2 otp-fbc6a824d8f9450087b2184c9ce6d03ef65da832.zip | |
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
| -rw-r--r-- | lib/observer/doc/src/crashdump_ug.xml | 4 | ||||
| -rw-r--r-- | lib/observer/src/crashdump_viewer.erl | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/observer/doc/src/crashdump_ug.xml b/lib/observer/doc/src/crashdump_ug.xml index dc65fe5b39..8b60f6ee98 100644 --- a/lib/observer/doc/src/crashdump_ug.xml +++ b/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> 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", []). |