From 3be08037219375e93e6f40a246df55f5ab9525e8 Mon Sep 17 00:00:00 2001
From: Craig Everett <zxq9@zxq9.com>
Date: Tue, 5 Jun 2018 12:14:03 +0900
Subject: [PATCH] "add realm" to "import realm"

---
 zomp/lib/otpr/zx/0.1.0/src/zx.erl       |  6 +++---
 zomp/lib/otpr/zx/0.1.0/src/zx_local.erl | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/zomp/lib/otpr/zx/0.1.0/src/zx.erl b/zomp/lib/otpr/zx/0.1.0/src/zx.erl
index e4fc632..158d76c 100644
--- a/zomp/lib/otpr/zx/0.1.0/src/zx.erl
+++ b/zomp/lib/otpr/zx/0.1.0/src/zx.erl
@@ -119,8 +119,8 @@ do(["list", "packages", Realm]) ->
 do(["list", "versions", PackageName]) ->
     ok = start(),
     done(zx_local:list_versions(PackageName));
-do(["add", "realm", RealmFile]) ->
-    done(zx_local:add_realm(RealmFile));
+do(["import", "realm", RealmFile]) ->
+    done(zx_local:import_realm(RealmFile));
 do(["drop", "dep", PackageString]) ->
     PackageID = zx_lib:package_id(PackageString),
     done(zx_local:drop_dep(PackageID));
@@ -579,7 +579,7 @@ usage() ->
 "  zx list packages Realm~n"
 "  zx list versions PackageID~n"
 "  zx latest PackageID~n"
-"  zx add realm RealmFile~n"
+"  zx import realm RealmFile~n"
 "  zx drop realm Realm~n"
 "  zx install PackageID~n"
 "  zx logpath [Package [1-10]]~n"
diff --git a/zomp/lib/otpr/zx/0.1.0/src/zx_local.erl b/zomp/lib/otpr/zx/0.1.0/src/zx_local.erl
index 45fbc88..ed41464 100644
--- a/zomp/lib/otpr/zx/0.1.0/src/zx_local.erl
+++ b/zomp/lib/otpr/zx/0.1.0/src/zx_local.erl
@@ -13,7 +13,7 @@
 -export([initialize/2, set_version/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,
-         add_realm/1, drop_realm/1,
+         import_realm/1, drop_realm/1,
          takeover/1, abdicate/1,
          create_plt/0, dialyze/0,
          grow_a_pair/0, drop_key/1,
@@ -385,19 +385,19 @@ list_versions2(PackageID) ->
     end.
 
 
--spec add_realm(Path) -> zx:outcome()
+-spec import_realm(Path) -> zx:outcome()
     when Path :: file:filename().
 %% @private
 %% Configure the system for a new realm by interpreting a .zrf file.
 %% Also log the SHA512 of the .zrf for the user.
 
-add_realm(Path) ->
+import_realm(Path) ->
     case file:read_file(Path) of
         {ok, Data} ->
             Digest = crypto:hash(sha512, Data),
             Text = integer_to_list(binary:decode_unsigned(Digest, big), 16),
             ok = log(info, "SHA-512 of ~ts: ~ts", [Path, Text]),
-            add_realm2(Data);
+            import_realm2(Data);
         {error, enoent} ->
             {error, "Realm bundle (.zrf) does not exist.", 2};
         {error, eisdir} ->
@@ -405,10 +405,10 @@ add_realm(Path) ->
     end.
 
 
--spec add_realm2(Data) -> zx:outcome()
+-spec import_realm2(Data) -> zx:outcome()
     when Data :: binary().
 
-add_realm2(Data) ->
+import_realm2(Data) ->
     case zx_lib:b_to_t(Data) of
         {ok, {RealmConf, KeyDER}} ->
             Realm = maps:get(realm, RealmConf),