diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2019-01-23 15:14:15 -0500 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2019-01-23 15:14:15 -0500 |
| commit | 84aff822087ca151104cd5011b5630f176479b3a (patch) | |
| tree | de71ba1fcd19aa79eb620f764ea48adbd91af79a | |
| parent | 84cb7c3baa213d1a7e9af92379c59e38c1e282e6 (diff) | |
| parent | 67fef1fa2639e9565eb354234a389ad3b6501592 (diff) | |
Merge branch 'starbelly-working-systests-on-darwin'
| -rw-r--r-- | src/rebar_file_utils.erl | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/rebar_file_utils.erl b/src/rebar_file_utils.erl index a51a557..0e0dfe3 100644 --- a/src/rebar_file_utils.erl +++ b/src/rebar_file_utils.erl @@ -189,16 +189,27 @@ cp_r([], _Dest) -> ok; cp_r(Sources, Dest) -> case os:type() of - {unix, _} -> + {unix, Os} -> EscSources = [rebar_utils:escape_chars(Src) || Src <- Sources], SourceStr = rebar_string:join(EscSources, " "), + % On darwin the following cp command will cp everything inside + % target vs target and everything inside, so we chop the last char + % off if it is a '/' + Source = case {Os == darwin, lists:last(SourceStr) == $/} of + {true, true} -> + rebar_string:trim(SourceStr, trailing, "/"); + {true, false} -> + SourceStr; + {false, _} -> + SourceStr + end, % ensure destination exists before copying files into it {ok, []} = rebar_utils:sh(?FMT("mkdir -p ~ts", [rebar_utils:escape_chars(Dest)]), [{use_stdout, false}, abort_on_error]), {ok, []} = rebar_utils:sh(?FMT("cp -Rp ~ts \"~ts\"", - [SourceStr, rebar_utils:escape_double_quotes(Dest)]), - [{use_stdout, false}, abort_on_error]), + [Source, rebar_utils:escape_double_quotes(Dest)]), + [{use_stdout, true}, abort_on_error]), ok; {win32, _} -> lists:foreach(fun(Src) -> ok = cp_r_win32(Src,Dest) end, Sources), |