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

Fix whitespace errors

Browse source
This commit is contained in:
Tuncer Ayaz 2012-01-09 12:43:09 +01:00
parent 4e471e6986
commit 2be2f2bfe7
1 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/rebar_upgrade.erl
View file

@ -45,7 +45,7 @@
TargetDir = rebar_rel_utils:get_target_dir(ReltoolConfig), TargetDir = rebar_rel_utils:get_target_dir(ReltoolConfig),
OldVerPath = filename:join([TargetParentDir, OldVerPath = filename:join([TargetParentDir,
rebar_rel_utils:get_previous_release_path()]), rebar_rel_utils:get_previous_release_path()]),
%% Run checks to make sure that building a package is possible %% Run checks to make sure that building a package is possible
{NewVerPath, NewName, NewVer} = run_checks(OldVerPath, ReltoolConfig), {NewVerPath, NewName, NewVer} = run_checks(OldVerPath, ReltoolConfig),
@ -80,27 +80,36 @@
run_checks(OldVerPath, ReltoolConfig) -> run_checks(OldVerPath, ReltoolConfig) ->
true = rebar_utils:prop_check(filelib:is_dir(OldVerPath), true = rebar_utils:prop_check(filelib:is_dir(OldVerPath),
"Release directory doesn't exist (~p)~n", [OldVerPath]), "Release directory doesn't exist (~p)~n",
[OldVerPath]),
{Name, Ver} = rebar_rel_utils:get_reltool_release_info(ReltoolConfig), {Name, Ver} = rebar_rel_utils:get_reltool_release_info(ReltoolConfig),
NewVerPath = filename:join([ NewVerPath =
rebar_rel_utils:get_target_parent_dir(ReltoolConfig), filename:join([rebar_rel_utils:get_target_parent_dir(ReltoolConfig),
Name]), Name]),
true = rebar_utils:prop_check(filelib:is_dir(NewVerPath), true = rebar_utils:prop_check(filelib:is_dir(NewVerPath),
"Release directory doesn't exist (~p)~n", [NewVerPath]), "Release directory doesn't exist (~p)~n",
[NewVerPath]),
{NewName, NewVer} = rebar_rel_utils:get_rel_release_info(Name, NewVerPath), {NewName, NewVer} = rebar_rel_utils:get_rel_release_info(Name, NewVerPath),
{OldName, OldVer} = rebar_rel_utils:get_rel_release_info(Name, OldVerPath), {OldName, OldVer} = rebar_rel_utils:get_rel_release_info(Name, OldVerPath),
true = rebar_utils:prop_check(NewName == OldName, true =
"New and old .rel release names do not match~n", []), rebar_utils:prop_check(NewName == OldName,
true = rebar_utils:prop_check(Name == NewName, "New and old .rel release names do not match~n",
"Reltool and .rel release names do not match~n", []), []),
true = rebar_utils:prop_check(NewVer =/= OldVer, true =
"New and old .rel contain the same version~n", []), rebar_utils:prop_check(Name == NewName,
true = rebar_utils:prop_check(Ver == NewVer, "Reltool and .rel release names do not match~n",
"Reltool and .rel versions do not match~n", []), []),
true =
rebar_utils:prop_check(NewVer =/= OldVer,
"New and old .rel contain the same version~n",
[]),
true =
rebar_utils:prop_check(Ver == NewVer,
"Reltool and .rel versions do not match~n", []),
{NewVerPath, NewName, NewVer}. {NewVerPath, NewName, NewVer}.
@ -154,8 +163,8 @@ boot_files(TargetDir, Ver, Name) ->
ok; ok;
_ -> _ ->
ok = file:make_symlink( ok = file:make_symlink(
filename:join(["start.boot"]), filename:join(["start.boot"]),
filename:join([".", ?TMP, "releases", Ver, Name ++ ".boot"])) filename:join([".", ?TMP, "releases", Ver, Name ++ ".boot"]))
end, end,
{ok, _} = {ok, _} =
file:copy( file:copy(