diff options
| author | Björn Gustavsson <[email protected]> | 2017-03-03 11:51:25 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-03-03 11:51:25 +0100 |
| commit | 0438c6c2c5c4a447ab3a47a443968488a0d835eb (patch) | |
| tree | 09ec3bd3f4a66ab2a9cdf3d1e468352763d4e228 | |
| parent | 960b4e63c8fcfa8577ac877464e300959f20db12 (diff) | |
| parent | 209985d1eca6389e363c4dc0dac7c91f9415de28 (diff) | |
| download | otp-0438c6c2c5c4a447ab3a47a443968488a0d835eb.tar.gz otp-0438c6c2c5c4a447ab3a47a443968488a0d835eb.tar.bz2 otp-0438c6c2c5c4a447ab3a47a443968488a0d835eb.zip | |
Merge pull request #1361 from bjorng/bjorn/home-directory/ERL-161/OTP-14249
Use a portable way to lookup the home directory
| -rw-r--r-- | lib/dialyzer/src/dialyzer_plt.erl | 8 | ||||
| -rw-r--r-- | lib/observer/src/observer_wx.erl | 3 | ||||
| -rw-r--r-- | lib/tools/examples/xref_examples.erl | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/lib/dialyzer/src/dialyzer_plt.erl b/lib/dialyzer/src/dialyzer_plt.erl index 0eda73a208..5ababa43dc 100644 --- a/lib/dialyzer/src/dialyzer_plt.erl +++ b/lib/dialyzer/src/dialyzer_plt.erl @@ -234,12 +234,8 @@ contains_mfa(#plt{info = Info, contracts = Contracts}, MFA) -> get_default_plt() -> case os:getenv("DIALYZER_PLT") of false -> - case os:getenv("HOME") of - false -> - plt_error("The HOME environment variable needs to be set " ++ - "so that Dialyzer knows where to find the default PLT"); - HomeDir -> filename:join(HomeDir, ".dialyzer_plt") - end; + {ok,[[HomeDir]]} = init:get_argument(home), + filename:join(HomeDir, ".dialyzer_plt"); UserSpecPlt -> UserSpecPlt end. diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl index 3031a1f90d..83de4fa64c 100644 --- a/lib/observer/src/observer_wx.erl +++ b/lib/observer/src/observer_wx.erl @@ -636,7 +636,8 @@ create_connect_dialog(connect, #state{frame = Frame}) -> wxWindow:setSizerAndFit(Dialog, VSizer), wxSizer:setSizeHints(VSizer, Dialog), - CookiePath = filename:join(os:getenv("HOME"), ".erlang.cookie"), + {ok,[[HomeDir]]} = init:get_argument(home), + CookiePath = filename:join(HomeDir, ".erlang.cookie"), DefaultCookie = case filelib:is_file(CookiePath) of true -> {ok, Bin} = file:read_file(CookiePath), diff --git a/lib/tools/examples/xref_examples.erl b/lib/tools/examples/xref_examples.erl index 4c082195a2..f7e71c9708 100644 --- a/lib/tools/examples/xref_examples.erl +++ b/lib/tools/examples/xref_examples.erl @@ -7,7 +7,7 @@ %% ${HOME}/unused_locals.txt. script() -> Root = code:root_dir(), - Dir = os:getenv("HOME"), + {ok,[[Dir]]} = init:get_argument(home), Server = s, xref:start(Server), {ok, _Relname} = xref:add_release(Server, code:lib_dir(), {name,otp}), |