diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-07-04 17:15:28 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-07-04 17:15:28 -0400 |
| commit | 9fdab2cb1bd9f9098567effaf2337f043320b601 (patch) | |
| tree | 4edb73c4e3dba79edeb7ff02e638934357ec348e /src | |
| parent | fcb3b98796f70ffff3bff734283b8af1cb863097 (diff) | |
| parent | 6d3fa8dd661f562b09c0be614b732939b5fe3c53 (diff) | |
Merge pull request #581 from carlosedp/robocopy-fix
Robocopy fix for different behaviour when copying/moving files and folders
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_file_utils.erl | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/src/rebar_file_utils.erl b/src/rebar_file_utils.erl index 3fc5698..073d189 100644 --- a/src/rebar_file_utils.erl +++ b/src/rebar_file_utils.erl @@ -155,10 +155,18 @@ mv(Source, Dest) -> [{use_stdout, false}, abort_on_error]), ok; {win32, _} -> - Res = rebar_utils:sh( - ?FMT("robocopy /move /s \"~s\" \"~s\" 1> nul", + case filelib:is_dir(Source) of + true -> + Cmd = ?FMT("robocopy /move /s \"~s\" \"~s\" 1> nul", [filename:nativename(Source), - filename:nativename(Dest)]), + filename:nativename(Dest)]); + false -> + Cmd = ?FMT("robocopy /move /s \"~s\" \"~s\" \"~s\" 1> nul", + [filename:nativename(filename:dirname(Source)), + filename:nativename(Dest), + filename:basename(Source)]) + end, + Res = rebar_utils:sh(Cmd, [{use_stdout, false}, return_on_error]), case win32_ok(Res) of true -> ok; @@ -249,9 +257,18 @@ delete_each_dir_win32([Dir | Rest]) -> xcopy_win32(Source,Dest)-> %% "xcopy \"~s\" \"~s\" /q /y /e 2> nul", Chanegd to robocopy to %% handle long names. May have issues with older windows. - Res = rebar_utils:sh( - ?FMT("robocopy \"~s\" \"~s\" /e /is /purge 2> nul", - [filename:nativename(Source), filename:nativename(Dest)]), + case filelib:is_dir(Source) of + true -> + Cmd = ?FMT("robocopy \"~s\" \"~s\" /e /is 1> nul", + [filename:nativename(Source), + filename:nativename(Dest)]); + false -> + Cmd = ?FMT("robocopy \"~s\" \"~s\" \"~s\" /e /is 1> nul", + [filename:nativename(filename:dirname(Source)), + filename:nativename(Dest), + filename:basename(Source)]) + end, + Res = rebar_utils:sh(Cmd, [{use_stdout, false}, return_on_error]), case win32_ok(Res) of true -> ok; |