File 1672-kernel-Search-XDG_CONFIG_HOME-for-.erlang.... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1672-kernel-Search-XDG_CONFIG_HOME-for-.erlang.patch of Package erlang (Revision 1c6d27e874ff4bb28c5c2e74b90a1fc8)

Currently displaying revision 1c6d27e874ff4bb28c5c2e74b90a1fc8 , Show latest

From 2db4b261282a022f3615f0cebaf5f38fe35a743b Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Wed, 27 Oct 2021 09:52:43 +0200
Subject: [PATCH 2/7] kernel: Search $XDG_CONFIG_HOME for .erlang

---
 erts/doc/src/erl_cmd.xml       |  7 +++--
 lib/kernel/test/init_SUITE.erl | 47 +++++++++++++++++++++++++++++++++-
 lib/stdlib/src/c.erl           |  9 ++++---
 3 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/erts/doc/src/erl_cmd.xml b/erts/doc/src/erl_cmd.xml
index a89586362d..87e13aa9c7 100644
--- a/erts/doc/src/erl_cmd.xml
+++ b/erts/doc/src/erl_cmd.xml
@@ -1875,14 +1875,17 @@ $ <input>erl \
 <tag>The <c>.erlang</c> startup file</tag>
 <item>
 When Erlang/OTP is started, the system searches for a file named
- <c>.erlang</c> in the user&apos;s home directory.
+ <c>.erlang</c> in the <seeerl marker="erts:init#home">
+ user&apos;s home directory</seeerl> and then
+ <seeerl marker="stdlib:filename#user_config">
+ <c>filename:basedir(user_config, "erlang")</c></seeerl>.
 If an <c>.erlang</c> file is found, it is assumed to contain valid
 Erlang expressions. These expressions are evaluated as if they were
 input to the shell.
 A typical <c>.erlang</c> file contains a set of search paths, for
 example:
 <code type="none"><![CDATA[
-io:format("executing user profile in HOME/.erlang\n",[]).
+io:format("executing user profile in $HOME/.erlang\n",[]).
 code:add_path("/home/calvin/test/ebin").
 code:add_path("/home/hobbes/bigappl-1.2/ebin").
 io:format(".erlang rc finished\n",[]). ]]></code>
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index 34db4d8080..71b0d44c60 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -20,6 +20,7 @@
 -module(init_SUITE).
 
 -include_lib("common_test/include/ct.hrl").
+-include_lib("stdlib/include/assert.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2]).
@@ -28,6 +29,7 @@
 	 many_restarts/0, many_restarts/1, restart_with_mode/1,
 	 get_plain_arguments/1,
 	 reboot/1, stop_status/1, stop/1, get_status/1, script_id/1,
+ dot_erlang/1,
 	 find_system_processes/0]).
 -export([boot1/1, boot2/1]).
 
@@ -50,7 +52,7 @@ all() ->
 [get_arguments, get_argument, boot_var,
 many_restarts, restart_with_mode,
 get_plain_arguments, restart, stop_status, get_status, script_id,
- {group, boot}].
+ dot_erlang, {group, boot}].
 
 groups() -> 
 [{boot, [], [boot1, boot2]}].
@@ -648,6 +650,49 @@ script_id(Config) when is_list(Config) ->
 end,
 ok.
 
+%% ------------------------------------------------
+%% Test that .erlang file works as it should
+%% ------------------------------------------------
+dot_erlang(Config) ->
+ PrivDir = proplists:get_value(priv_dir, Config),
+
+ TestHome = filename:join(PrivDir, ?FUNCTION_NAME),
+ ok = file:make_dir(TestHome),
+
+ HomeEnv = case os:type() of
+ {win32, _} ->
+ [Drive | Path] = filename:split(TestHome),
+ [{"APPDATA", filename:join(TestHome,"AppData")},
+ {"HOMEDRIVE", Drive}, {"HOMEPATH", Path}];
+ _ ->
+ [{"HOME", TestHome}]
+ end,
+
+ NodeOpts = #{ env => HomeEnv },
+
+ %% Get basedir of peer node
+ {ok, CreatorPeer, CreatorNode} = ?CT_PEER(NodeOpts),
+ UserConfig = erpc:call(CreatorNode, filename, basedir, [user_config,"erlang"]),
+ peer:stop(CreatorPeer),
+
+ XDGErlang = filename:join([UserConfig, ".erlang"]),
+ ok = filelib:ensure_dir(XDGErlang),
+ ok = file:write_file(XDGErlang, "application:set_env(kernel,test,xdg)."),
+
+ {ok, Peer, Node} = ?CT_PEER(NodeOpts),
+
+ ?assertEqual({ok, xdg}, erpc:call(Node, application, get_env, [kernel, test])),
+ peer:stop(Peer),
+
+ HomeErlang = filename:join([TestHome, ".erlang"]),
+ ok = file:write_file(HomeErlang, "application:set_env(kernel,test,home)."),
+ {ok, Peer2, Node2} = ?CT_PEER(NodeOpts),
+
+ ?assertEqual({ok, home}, erpc:call(Node2, application, get_env, [kernel, test])),
+ peer:stop(Peer2),
+
+ ok.
+
 %% ------------------------------------------------
 %% Start the slave system with -boot flag.
 %% ------------------------------------------------
diff --git a/lib/stdlib/src/c.erl b/lib/stdlib/src/c.erl
index aa2b87ca05..060646f7f4 100644
--- a/lib/stdlib/src/c.erl
+++ b/lib/stdlib/src/c.erl
@@ -792,11 +792,12 @@ lm() ->
 -spec erlangrc() -> {ok, file:filename()} | {error, term()}.
 
 erlangrc() ->
+ UserConfig = filename:basedir(user_config,"erlang"),
 case init:get_argument(home) of
-	{ok,[[Home]]} ->
-	 erlangrc([Home]);
-	_ ->
- {error, enoent}
+ {ok,[[Home]]} ->
+ erlangrc([Home, UserConfig]);
+ _ ->
+ erlangrc([UserConfig])
 end.
 
 -spec erlangrc(PathList) -> {ok, file:filename()} | {error, term()}
-- 
2.31.1

Places

File 1672-kernel-Search-XDG_CONFIG_HOME-for-.erlang.patch of Package erlang (Revision 1c6d27e874ff4bb28c5c2e74b90a1fc8)

Places