소스 검색

Merge pull request #203 from tsloughter/mv

use rebar_file_utils:mv instead of copy for fetched source
pull/205/head
Tristan Sloughter 10 년 전
부모
커밋
46bd6fc59d
1개의 변경된 파일8개의 추가작업 그리고 2개의 파일을 삭제
  1. +8
    -2
      src/rebar_fetch.erl

+ 8
- 2
src/rebar_fetch.erl 파일 보기

@ -38,7 +38,8 @@ download_source(AppDir, Source, State) ->
ec_file:mkdir_p(AppDir1), ec_file:mkdir_p(AppDir1),
code:del_path(filename:absname(filename:join(AppDir1, "ebin"))), code:del_path(filename:absname(filename:join(AppDir1, "ebin"))),
ec_file:remove(filename:absname(AppDir1), [recursive]), ec_file:remove(filename:absname(AppDir1), [recursive]),
ok = ec_file:copy(TmpDir, filename:absname(AppDir1), [recursive]),
?DEBUG("Moving checkout ~p to ~p", [TmpDir, filename:absname(AppDir1)]),
ok = rebar_file_utils:mv(TmpDir, filename:absname(AppDir1)),
true; true;
{tarball, File} -> {tarball, File} ->
Contents = filename:join(TmpDir, "contents"), Contents = filename:join(TmpDir, "contents"),
@ -49,7 +50,12 @@ download_source(AppDir, Source, State) ->
[{cwd, Contents}, compressed]), [{cwd, Contents}, compressed]),
code:del_path(filename:absname(filename:join(AppDir1, "ebin"))), code:del_path(filename:absname(filename:join(AppDir1, "ebin"))),
ec_file:remove(filename:absname(AppDir1), [recursive]), ec_file:remove(filename:absname(AppDir1), [recursive]),
ok = ec_file:copy(Contents, filename:absname(AppDir1), [recursive]),
?DEBUG("Moving contents ~p to ~p", [Contents, filename:absname(AppDir1)]),
ok = rebar_file_utils:mv(Contents, filename:absname(AppDir1)),
?DEBUG("Removing tmp dir ~p", [TmpDir]),
ec_file:remove(TmpDir, [recursive]),
true true
end end
catch catch

불러오는 중...
취소
저장