pharpend/zx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"add realm" to "import realm"

Browse Source
This commit is contained in:
Craig Everett 2018-06-05 12:14:03 +09:00
parent f630d4d88e
commit 3be0803721
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zomp/lib/otpr/zx/0.1.0/src/zx.erl
View File

@ -119,8 +119,8 @@ do(["list", "packages", Realm]) ->
do(["list", "versions", PackageName]) -> do(["list", "versions", PackageName]) ->
ok = start(), ok = start(),
done(zx_local:list_versions(PackageName)); done(zx_local:list_versions(PackageName));
do(["add", "realm", RealmFile]) -> do(["import", "realm", RealmFile]) ->
done(zx_local:add_realm(RealmFile)); done(zx_local:import_realm(RealmFile));
do(["drop", "dep", PackageString]) -> do(["drop", "dep", PackageString]) ->
PackageID = zx_lib:package_id(PackageString), PackageID = zx_lib:package_id(PackageString),
done(zx_local:drop_dep(PackageID)); done(zx_local:drop_dep(PackageID));
@ -579,7 +579,7 @@ usage() ->
" zx list packages Realm~n" " zx list packages Realm~n"
" zx list versions PackageID~n" " zx list versions PackageID~n"
" zx latest PackageID~n" " zx latest PackageID~n"
" zx add realm RealmFile~n" " zx import realm RealmFile~n"
" zx drop realm Realm~n" " zx drop realm Realm~n"
" zx install PackageID~n" " zx install PackageID~n"
" zx logpath [Package [1-10]]~n" " zx logpath [Package [1-10]]~n"

12
zomp/lib/otpr/zx/0.1.0/src/zx_local.erl
View File

@ -13,7 +13,7 @@
-export([initialize/2, set_version/1, -export([initialize/2, set_version/1,
list_realms/0, list_packages/1, list_versions/1, list_realms/0, list_packages/1, list_versions/1,
set_dep/1, list_deps/0, list_deps/1, drop_dep/1, verup/1, package/1, set_dep/1, list_deps/0, list_deps/1, drop_dep/1, verup/1, package/1,
add_realm/1, drop_realm/1, import_realm/1, drop_realm/1,
takeover/1, abdicate/1, takeover/1, abdicate/1,
create_plt/0, dialyze/0, create_plt/0, dialyze/0,
grow_a_pair/0, drop_key/1, grow_a_pair/0, drop_key/1,
@ -385,19 +385,19 @@ list_versions2(PackageID) ->
end. end.
-spec add_realm(Path) -> zx:outcome() -spec import_realm(Path) -> zx:outcome()
when Path :: file:filename(). when Path :: file:filename().
%% @private %% @private
%% Configure the system for a new realm by interpreting a .zrf file. %% Configure the system for a new realm by interpreting a .zrf file.
%% Also log the SHA512 of the .zrf for the user. %% Also log the SHA512 of the .zrf for the user.
add_realm(Path) -> import_realm(Path) ->
case file:read_file(Path) of case file:read_file(Path) of
{ok, Data} -> {ok, Data} ->
Digest = crypto:hash(sha512, Data), Digest = crypto:hash(sha512, Data),
Text = integer_to_list(binary:decode_unsigned(Digest, big), 16), Text = integer_to_list(binary:decode_unsigned(Digest, big), 16),
ok = log(info, "SHA-512 of ~ts: ~ts", [Path, Text]), ok = log(info, "SHA-512 of ~ts: ~ts", [Path, Text]),
add_realm2(Data); import_realm2(Data);
{error, enoent} -> {error, enoent} ->
{error, "Realm bundle (.zrf) does not exist.", 2}; {error, "Realm bundle (.zrf) does not exist.", 2};
{error, eisdir} -> {error, eisdir} ->
@ -405,10 +405,10 @@ add_realm(Path) ->
end. end.
-spec add_realm2(Data) -> zx:outcome() -spec import_realm2(Data) -> zx:outcome()
when Data :: binary(). when Data :: binary().
add_realm2(Data) -> import_realm2(Data) ->
case zx_lib:b_to_t(Data) of case zx_lib:b_to_t(Data) of
{ok, {RealmConf, KeyDER}} -> {ok, {RealmConf, KeyDER}} ->
Realm = maps:get(realm, RealmConf), Realm = maps:get(realm, RealmConf),