aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/rlx_prv_app_discover.erl8
-rw-r--r--src/rlx_prv_archive.erl2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/rlx_prv_app_discover.erl b/src/rlx_prv_app_discover.erl
index d58cf71..4ef7efc 100644
--- a/src/rlx_prv_app_discover.erl
+++ b/src/rlx_prv_app_discover.erl
@@ -132,7 +132,13 @@ add_system_lib_dir(State) ->
add_environment_lib_dir(_State) ->
case os:getenv("ERL_LIBS") of
false -> [];
- Libs -> [erlang:iolist_to_binary(L) || L <- rlx_string:lexemes(Libs, ":")]
+ Libs ->
+ Delim =
+ case os:type() of
+ {win32,_} -> ";";
+ _ -> ":"
+ end,
+ [erlang:iolist_to_binary(L) || L <- rlx_string:lexemes(Libs, Delim)]
end.
%% Order matters so this slow dedup needs to be used
diff --git a/src/rlx_prv_archive.erl b/src/rlx_prv_archive.erl
index 8fd03c1..b2fe289 100644
--- a/src/rlx_prv_archive.erl
+++ b/src/rlx_prv_archive.erl
@@ -158,6 +158,8 @@ overlay_files(OverlayVars, Overlay, OutputDir) ->
to({link, _, To}) ->
To;
+to({copy, From, "."}) ->
+ filename:basename(From);
to({copy, _, To}) ->
To;
to({mkdir, To}) ->