ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

rebar3: Fix typos and support name-version-tag

Browse Source 
The fixup_app_name/1 change notably supports packages like proper-1.1.1-beta.
This commit is contained in:
Eric Bailey 2016-11-23 15:07:31 -06:00 committed by Tuomas Tynkkynen
parent fe727a19c1
commit ab9688a63a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
View File

@ -41,7 +41,7 @@ main(Args) ->
{ok, RequiredData} = gather_required_data_from_the_environment(ArgData), {ok, RequiredData} = gather_required_data_from_the_environment(ArgData),
do_the_bootstrap(RequiredData). do_the_bootstrap(RequiredData).
%% @doc There are two modes 'registery_only' where the register is %% @doc There are two modes 'registry_only' where the register is
%% created from hex and everything else. %% created from hex and everything else.
-spec do_the_bootstrap(#data{}) -> ok. -spec do_the_bootstrap(#data{}) -> ok.
do_the_bootstrap(RequiredData = #data{registry_only = true}) -> do_the_bootstrap(RequiredData = #data{registry_only = true}) ->
@ -55,7 +55,7 @@ do_the_bootstrap(RequiredData) ->
%% @doc %% @doc
%% Argument parsing is super simple only because we want to keep the %% Argument parsing is super simple only because we want to keep the
%% dependencies minimal. For now there can be two entries on the %% dependencies minimal. For now there can be two entries on the
%% command line, "registery-only" and "debug-info" %% command line, "registry-only" and "debug-info"
-spec parse_args([string()]) -> #data{}. -spec parse_args([string()]) -> #data{}.
parse_args(Args0) -> parse_args(Args0) ->
PossibleArgs = sets:from_list(["registry-only", "debug-info"]), PossibleArgs = sets:from_list(["registry-only", "debug-info"]),
@ -146,13 +146,14 @@ make_symlink(Path, TargetFile) ->
%% @doc %% @doc
%% This takes an app name in the standard OTP <name>-<version> format %% This takes an app name in the standard OTP <name>-<version> format
%% and returns just the app name. Why? because rebar is doesn't %% and returns just the app name. Why? because rebar doesn't
%% respect OTP conventions in some cases. %% respect OTP conventions in some cases.
-spec fixup_app_name(string()) -> string(). -spec fixup_app_name(string()) -> string().
fixup_app_name(FileName) -> fixup_app_name(FileName) ->
case string:tokens(FileName, "-") of case string:tokens(FileName, "-") of
[Name] -> Name; [Name] -> Name;
[Name, _Version] -> Name [Name, _Version] -> Name;
[Name, _Version, _Tag] -> Name
end. end.
-spec bootstrap_registry(#data{}) -> ok. -spec bootstrap_registry(#data{}) -> ok.