github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2024-12-18 03:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix whitespace errors

Browse source
This commit is contained in:
Tuncer Ayaz 2012-06-01 11:45:56 +02:00
parent e4bc95500c
commit f7d9a9bf8b
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/rebar_reltool.erl
View file

@ -239,7 +239,7 @@ mk_target_dir(TargetDir) ->
end; end;
{error, Reason} -> {error, Reason} ->
?ERROR("Failed to make target dir ~p: ~s\n", ?ERROR("Failed to make target dir ~p: ~s\n",
[TargetDir, file:format_error(Reason)]), [TargetDir, file:format_error(Reason)]),
?FAIL ?FAIL
end. end.
@ -259,7 +259,8 @@ dump_spec(Spec) ->
execute_overlay([], _Vars, _BaseDir, _TargetDir) -> execute_overlay([], _Vars, _BaseDir, _TargetDir) ->
ok; ok;
execute_overlay([{mkdir, Out} | Rest], Vars, BaseDir, TargetDir) -> execute_overlay([{mkdir, Out} | Rest], Vars, BaseDir, TargetDir) ->
OutFile = rebar_templater:render(filename:join([TargetDir, Out, "dummy"]), Vars), OutFile = rebar_templater:render(
filename:join([TargetDir, Out, "dummy"]), Vars),
ok = filelib:ensure_dir(OutFile), ok = filelib:ensure_dir(OutFile),
?DEBUG("Created dir ~s\n", [filename:dirname(OutFile)]), ?DEBUG("Created dir ~s\n", [filename:dirname(OutFile)]),
execute_overlay(Rest, Vars, BaseDir, TargetDir); execute_overlay(Rest, Vars, BaseDir, TargetDir);
@ -276,16 +277,19 @@ execute_overlay([{copy, In, Out} | Rest], Vars, BaseDir, TargetDir) ->
end, end,
rebar_file_utils:cp_r([InFile], OutFile), rebar_file_utils:cp_r([InFile], OutFile),
execute_overlay(Rest, Vars, BaseDir, TargetDir); execute_overlay(Rest, Vars, BaseDir, TargetDir);
execute_overlay([{template_wildcard, Wildcard, OutDir} | Rest], Vars, BaseDir, TargetDir) -> execute_overlay([{template_wildcard, Wildcard, OutDir} | Rest], Vars,
BaseDir, TargetDir) ->
%% Generate a series of {template, In, Out} instructions from the wildcard %% Generate a series of {template, In, Out} instructions from the wildcard
%% that will get processed per normal %% that will get processed per normal
Ifun = fun(F, Acc0) -> Ifun = fun(F, Acc0) ->
[{template, F, filename:join(OutDir, filename:basename(F))} | Acc0] [{template, F,
filename:join(OutDir, filename:basename(F))} | Acc0]
end, end,
NewInstrs = lists:foldl(Ifun, Rest, filelib:wildcard(Wildcard, BaseDir)), NewInstrs = lists:foldl(Ifun, Rest, filelib:wildcard(Wildcard, BaseDir)),
case length(NewInstrs) =:= length(Rest) of case length(NewInstrs) =:= length(Rest) of
true -> true ->
?WARN("template_wildcard: ~s did not match any files!\n", [Wildcard]); ?WARN("template_wildcard: ~s did not match any files!\n",
[Wildcard]);
false -> false ->
ok ok
end, end,
@ -322,7 +326,8 @@ execute_overlay([{replace, Out, Regex, Replacement, Opts} | Rest],
Vars, BaseDir, TargetDir) -> Vars, BaseDir, TargetDir) ->
Filename = rebar_templater:render(filename:join(TargetDir, Out), Vars), Filename = rebar_templater:render(filename:join(TargetDir, Out), Vars),
{ok, OrigData} = file:read_file(Filename), {ok, OrigData} = file:read_file(Filename),
Data = re:replace(OrigData, Regex, rebar_templater:render(Replacement, Vars), Data = re:replace(OrigData, Regex,
rebar_templater:render(Replacement, Vars),
[global, {return, binary}] ++ Opts), [global, {return, binary}] ++ Opts),
case file:write_file(Filename, Data) of case file:write_file(Filename, Data) of
ok -> ok ->
@ -341,9 +346,10 @@ apply_file_info(InFile, OutFile) ->
create_RELEASES(TargetDir, RelName, RelVsn) -> create_RELEASES(TargetDir, RelName, RelVsn) ->
ReleasesDir = filename:join(TargetDir, "releases"), ReleasesDir = filename:join(TargetDir, "releases"),
case release_handler:create_RELEASES(TargetDir, ReleasesDir, case release_handler:create_RELEASES(
filename:join([ReleasesDir, RelVsn, RelName ++ ".rel"]), TargetDir, ReleasesDir,
filename:join(TargetDir, "lib")) of filename:join([ReleasesDir, RelVsn, RelName ++ ".rel"]),
filename:join(TargetDir, "lib")) of
ok -> ok ->
ok; ok;
{error, Reason} -> {error, Reason} ->