|
 |
2053594 |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
2053594 |
Date: Wed, 2 Aug 2017 16:12:19 +0300
|
|
|
2053594 |
Subject: [PATCH] Add extra search directory
|
|
|
2053594 |
|
|
|
2053594 |
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
2053594 |
|
|
|
2053594 |
diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
|
|
|
5f85313 |
index 68e1205301..0f534ff814 100644
|
|
|
2053594 |
--- a/lib/kernel/src/code_server.erl
|
|
|
2053594 |
+++ b/lib/kernel/src/code_server.erl
|
|
|
c76a757 |
@@ -79,11 +79,17 @@ init(Ref, Parent, [Root,Mode]) ->
|
|
|
2053594 |
IPath =
|
|
|
2053594 |
case Mode of
|
|
|
2053594 |
interactive ->
|
|
|
2053594 |
- LibDir = filename:append(Root, "lib"),
|
|
|
2053594 |
- {ok,Dirs} = erl_prim_loader:list_dir(LibDir),
|
|
|
2053594 |
- Paths = make_path(LibDir, Dirs),
|
|
|
2053594 |
+ F = fun(R) ->
|
|
|
2053594 |
+ LD = filename:append(R, "lib"),
|
|
|
c76a757 |
+ case erl_prim_loader:list_dir(LD) of
|
|
|
c76a757 |
+ error -> [];
|
|
|
c76a757 |
+ {ok, D} -> make_path(LD, D)
|
|
|
c76a757 |
+ end
|
|
|
2053594 |
+ end,
|
|
|
2053594 |
+ Paths = F(Root),
|
|
|
2053594 |
+ SharedPaths = F("/usr/share/erlang"),
|
|
|
2053594 |
UserLibPaths = get_user_lib_dirs(),
|
|
|
2053594 |
- ["."] ++ UserLibPaths ++ Paths;
|
|
|
2053594 |
+ ["."] ++ UserLibPaths ++ Paths ++ SharedPaths;
|
|
|
2053594 |
_ ->
|
|
|
2053594 |
[]
|
|
|
2053594 |
end,
|