aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2014-07-10 18:29:32 -0500
committerTristan Sloughter <[email protected]>2014-07-10 18:29:32 -0500
commit83678a116e6178cd870720c354ca79a4a9b3c853 (patch)
treee07f14dcbe5aa71a6ad6cb49242b1d39247756b4 /src
parent6b2c201d3af9b9042af719fdc58af6b0f820b1c3 (diff)
parent1a1c84b7221ca263bd569f926defa19979509073 (diff)
downloadrelx-83678a116e6178cd870720c354ca79a4a9b3c853.tar.gz
relx-83678a116e6178cd870720c354ca79a4a9b3c853.tar.bz2
relx-83678a116e6178cd870720c354ca79a4a9b3c853.zip
Merge pull request #208 from reset/assembler-copy-symlink-dir-contents
Ensure assembler copies the contents of symlinked dirs
Diffstat (limited to 'src')
-rw-r--r--src/rlx_prv_assembler.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl
index bc4e606..f34dfa6 100644
--- a/src/rlx_prv_assembler.erl
+++ b/src/rlx_prv_assembler.erl
@@ -101,7 +101,7 @@ print_dev_mode(State) ->
-spec create_output_dir(file:name()) ->
ok | {error, Reason::term()}.
create_output_dir(OutputDir) ->
- case filelib:is_dir(OutputDir) of
+ case ec_file:is_dir(OutputDir) of
false ->
case rlx_util:mkdir_p(OutputDir) of
ok ->
@@ -169,7 +169,7 @@ remove_symlink_or_directory(TargetDir) ->
true ->
ec_file:remove(TargetDir);
false ->
- case filelib:is_dir(TargetDir) of
+ case ec_file:is_dir(TargetDir) of
true ->
ok = ec_file:remove(TargetDir, [recursive]);
false ->
@@ -204,7 +204,7 @@ copy_directory(AppDir, TargetDir, IncludeSrc) ->
copy_dir(AppDir, TargetDir, SubDir) ->
SubSource = filename:join(AppDir, SubDir),
SubTarget = filename:join(TargetDir, SubDir),
- case filelib:is_dir(SubSource) of
+ case ec_file:is_dir(SubSource) of
true ->
ok = rlx_util:mkdir_p(SubTarget),
case ec_file:copy(SubSource, SubTarget, [recursive]) of
@@ -371,7 +371,7 @@ include_erts(State, Release, OutputDir, RelDir) ->
ErtsDir = filename:join([Prefix, "erts-" ++ ErtsVersion]),
LocalErts = filename:join([OutputDir, "erts-" ++ ErtsVersion]),
{OsFamily, _OsName} = os:type(),
- case filelib:is_dir(ErtsDir) of
+ case ec_file:is_dir(ErtsDir) of
false ->
?RLX_ERROR({specified_erts_does_not_exist, ErtsVersion});
true ->