diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-08-27 16:41:55 +1200 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-08-27 16:41:55 +1200 |
| commit | a1b1fd07b2ce08ae3ee338fb65b8150d42c4711d (patch) | |
| tree | ba3816ac9ee603aeadf84f12ebdb1d8804be21d9 /src | |
| parent | 08e07d6e380ee1a7f3c3f7e4ffea75aa5b6a5c52 (diff) | |
| parent | 00a4a445472901780bfba3428dbca0ea18cc806a (diff) | |
Merge pull request #755 from tsloughter/master
remove replacement of home dir with ~ in update output
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_file_utils.erl | 5 | ||||
| -rw-r--r-- | src/rebar_prv_update.erl | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/rebar_file_utils.erl b/src/rebar_file_utils.erl index 4f8eff5..2f39b96 100644 --- a/src/rebar_file_utils.erl +++ b/src/rebar_file_utils.erl @@ -27,7 +27,6 @@ -module(rebar_file_utils). -export([try_consult/1, - replace_home_dir/1, format_error/1, symlink_or_copy/2, rm_rf/1, @@ -60,10 +59,6 @@ try_consult(File) -> throw(?PRV_ERROR({bad_term_file, File, Reason})) end. -replace_home_dir(Dir) -> - HomeDir = rebar_dir:home_dir(), - re:replace(Dir, [$^ | HomeDir], "~", [{return, list}]). - format_error({bad_term_file, AppFile, Reason}) -> io_lib:format("Error reading file ~s: ~s", [AppFile, file:format_error(Reason)]). diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl index 10faf4d..0491535 100644 --- a/src/rebar_prv_update.erl +++ b/src/rebar_prv_update.erl @@ -50,7 +50,7 @@ do(State) -> {ok, Data} = file:read_file(TmpFile), Unzipped = zlib:gunzip(Data), ok = file:write_file(HexFile, Unzipped), - ?INFO("Writing registry to ~s", [rebar_file_utils:replace_home_dir(HexFile)]), + ?INFO("Writing registry to ~s", [HexFile]), hex_to_index(State), ok catch @@ -95,7 +95,7 @@ hex_to_index(State) -> end, true, Registry), ets:insert(?PACKAGE_TABLE, {package_index_version, ?PACKAGE_INDEX_VERSION}), - ?INFO("Writing index to ~s", [rebar_file_utils:replace_home_dir(PackageIndex)]), + ?INFO("Writing index to ~s", [PackageIndex]), ets:tab2file(?PACKAGE_TABLE, PackageIndex), true after |