From 4a5fe746606e6c2bed71ddef4c13f08888e14e3e Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Tue, 16 Jun 2020 15:33:50 +0900 Subject: [PATCH 1/3] Make local_request fetches work when zomp is locally hosted https://gitlab.com/zxq9/zx/-/issues/86 --- zomp/etc/version.txt | 2 +- zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/Emakefile | 0 zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/LICENSE | 0 .../otpr/zx/{0.10.7 => 0.10.8}/ebin/zx.app | 2 +- .../{0.10.7 => 0.10.8}/include/zx_logger.hrl | 0 .../otpr/zx/{0.10.7 => 0.10.8}/launcher.png | Bin zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/make_zx | 0 .../lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx.erl | 2 +- .../zx/{0.10.7 => 0.10.8}/src/zx_auth.erl | 2 +- .../zx/{0.10.7 => 0.10.8}/src/zx_conn.erl | 2 +- .../zx/{0.10.7 => 0.10.8}/src/zx_conn_sup.erl | 2 +- .../zx/{0.10.7 => 0.10.8}/src/zx_daemon.erl | 53 +++++++++++++++++- .../otpr/zx/{0.10.7 => 0.10.8}/src/zx_key.erl | 2 +- .../otpr/zx/{0.10.7 => 0.10.8}/src/zx_lib.erl | 2 +- .../zx/{0.10.7 => 0.10.8}/src/zx_local.erl | 2 +- .../otpr/zx/{0.10.7 => 0.10.8}/src/zx_net.erl | 2 +- .../zx/{0.10.7 => 0.10.8}/src/zx_peer.erl | 4 +- .../zx/{0.10.7 => 0.10.8}/src/zx_peer_man.erl | 2 +- .../zx/{0.10.7 => 0.10.8}/src/zx_peer_sup.erl | 2 +- .../zx/{0.10.7 => 0.10.8}/src/zx_peers.erl | 2 +- .../zx/{0.10.7 => 0.10.8}/src/zx_proxy.erl | 2 +- .../otpr/zx/{0.10.7 => 0.10.8}/src/zx_sup.erl | 2 +- .../otpr/zx/{0.10.7 => 0.10.8}/src/zx_tty.erl | 2 +- .../zx/{0.10.7 => 0.10.8}/src/zx_userconf.erl | 2 +- .../otpr/zx/{0.10.7 => 0.10.8}/src/zx_zsp.erl | 2 +- .../zx/{0.10.7 => 0.10.8}/templates/Emakefile | 0 .../templates/boringlib/funfile.erl | 0 .../zx/{0.10.7 => 0.10.8}/templates/escript | 0 .../templates/example_server/appmod.erl | 0 .../templates/example_server/src/_client.erl | 0 .../example_server/src/_client_man.erl | 0 .../example_server/src/_client_sup.erl | 0 .../templates/example_server/src/_clients.erl | 0 .../templates/example_server/src/_sup.erl | 0 .../zx/{0.10.7 => 0.10.8}/templates/gitignore | 0 .../templates/hellowx/appmod.erl | 0 .../templates/hellowx/src/_con.erl | 0 .../templates/hellowx/src/_gui.erl | 0 .../templates/hellowx/src/_sup.erl | 0 .../templates/licenses/apache2.txt | 0 .../templates/licenses/bsd2.txt | 0 .../templates/licenses/bsd3.txt | 0 .../templates/licenses/cc0.txt | 0 .../templates/licenses/gpl3.txt | 0 .../templates/licenses/lgpl3.txt | 0 .../templates/licenses/mit.txt | 0 .../templates/licenses/mpl2.txt | 0 .../templates/simplecli.erl | 0 zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/zomp.meta | 2 +- 49 files changed, 72 insertions(+), 23 deletions(-) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/Emakefile (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/LICENSE (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/ebin/zx.app (93%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/include/zx_logger.hrl (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/launcher.png (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/make_zx (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx.erl (99%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_auth.erl (99%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_conn.erl (99%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_conn_sup.erl (99%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_daemon.erl (98%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_key.erl (99%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_lib.erl (99%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_local.erl (99%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_net.erl (99%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_peer.erl (99%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_peer_man.erl (99%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_peer_sup.erl (99%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_peers.erl (98%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_proxy.erl (99%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_sup.erl (99%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_tty.erl (99%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_userconf.erl (99%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/src/zx_zsp.erl (99%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/Emakefile (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/boringlib/funfile.erl (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/escript (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/example_server/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/example_server/src/_client.erl (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/example_server/src/_client_man.erl (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/example_server/src/_client_sup.erl (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/example_server/src/_clients.erl (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/example_server/src/_sup.erl (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/gitignore (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/hellowx/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/hellowx/src/_con.erl (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/hellowx/src/_gui.erl (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/hellowx/src/_sup.erl (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/licenses/apache2.txt (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/licenses/bsd2.txt (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/licenses/bsd3.txt (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/licenses/cc0.txt (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/licenses/gpl3.txt (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/licenses/lgpl3.txt (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/licenses/mit.txt (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/licenses/mpl2.txt (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/templates/simplecli.erl (100%) rename zomp/lib/otpr/zx/{0.10.7 => 0.10.8}/zomp.meta (91%) diff --git a/zomp/etc/version.txt b/zomp/etc/version.txt index 2d993c4..1a46c7f 100644 --- a/zomp/etc/version.txt +++ b/zomp/etc/version.txt @@ -1 +1 @@ -0.10.7 +0.10.8 diff --git a/zomp/lib/otpr/zx/0.10.7/Emakefile b/zomp/lib/otpr/zx/0.10.8/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/Emakefile rename to zomp/lib/otpr/zx/0.10.8/Emakefile diff --git a/zomp/lib/otpr/zx/0.10.7/LICENSE b/zomp/lib/otpr/zx/0.10.8/LICENSE similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/LICENSE rename to zomp/lib/otpr/zx/0.10.8/LICENSE diff --git a/zomp/lib/otpr/zx/0.10.7/ebin/zx.app b/zomp/lib/otpr/zx/0.10.8/ebin/zx.app similarity index 93% rename from zomp/lib/otpr/zx/0.10.7/ebin/zx.app rename to zomp/lib/otpr/zx/0.10.8/ebin/zx.app index fe9fd2f..8ccb958 100644 --- a/zomp/lib/otpr/zx/0.10.7/ebin/zx.app +++ b/zomp/lib/otpr/zx/0.10.8/ebin/zx.app @@ -1,6 +1,6 @@ {application,zx, [{description,"An Erlang development tool and Zomp user client"}, - {vsn,"0.10.7"}, + {vsn,"0.10.8"}, {applications,[stdlib,kernel]}, {modules,[zx,zx_auth,zx_conn,zx_conn_sup,zx_daemon,zx_key, zx_lib,zx_local,zx_net,zx_peer,zx_peer_man, diff --git a/zomp/lib/otpr/zx/0.10.7/include/zx_logger.hrl b/zomp/lib/otpr/zx/0.10.8/include/zx_logger.hrl similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/include/zx_logger.hrl rename to zomp/lib/otpr/zx/0.10.8/include/zx_logger.hrl diff --git a/zomp/lib/otpr/zx/0.10.7/launcher.png b/zomp/lib/otpr/zx/0.10.8/launcher.png similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/launcher.png rename to zomp/lib/otpr/zx/0.10.8/launcher.png diff --git a/zomp/lib/otpr/zx/0.10.7/make_zx b/zomp/lib/otpr/zx/0.10.8/make_zx similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/make_zx rename to zomp/lib/otpr/zx/0.10.8/make_zx diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx.erl b/zomp/lib/otpr/zx/0.10.8/src/zx.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.7/src/zx.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx.erl index 13f33af..f16c1ab 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx.erl @@ -24,7 +24,7 @@ %%% @end -module(zx). --vsn("0.10.7"). +-vsn("0.10.8"). -behavior(application). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_auth.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_auth.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.7/src/zx_auth.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_auth.erl index d20a32a..7edbffe 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_auth.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_auth.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_auth). --vsn("0.10.7"). +-vsn("0.10.8"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_conn.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_conn.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.7/src/zx_conn.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_conn.erl index d03784f..7860ecd 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_conn.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_conn.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_conn). --vsn("0.10.7"). +-vsn("0.10.8"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_conn_sup.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_conn_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.7/src/zx_conn_sup.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_conn_sup.erl index 0f1e4ca..0d92d47 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_conn_sup.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_conn_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_conn_sup). --vsn("0.10.7"). +-vsn("0.10.8"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_daemon.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_daemon.erl similarity index 98% rename from zomp/lib/otpr/zx/0.10.7/src/zx_daemon.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_daemon.erl index ca04f98..d8ac3a5 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_daemon.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_daemon.erl @@ -138,7 +138,7 @@ %%% @end -module(zx_daemon). --vsn("0.10.7"). +-vsn("0.10.8"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). @@ -1406,6 +1406,14 @@ eval_queue(Actions, State) -> local_dispatch([], State) -> State; +local_dispatch([{request, Pid, ID, {fetch, R, N, V}} | Rest], State) -> + Result = + case zomp_realm_man:lookup(R) of + {ok, RealmPID} -> local_fetch(RealmPID, {R, N, V}); + Error -> Error + end, + Pid ! {result, ID, Result}, + local_dispatch(Rest, State); local_dispatch([{request, Pid, ID, Message} | Rest], State) -> Realm = element(2, Message), Result = @@ -1452,6 +1460,46 @@ local_request(R, {list_sysops}) -> zomp_realm:list_sysops(R); local_request(R, {list_type, T}) -> zomp_realm:list_type(R, T). +local_fetch(RealmPID, PackageID = {_, N, V}) -> + {ok, PackageString} = zx_lib:package_string(PackageID), + ok = tell("Fetching ~s", [PackageString]), + case zomp_realm:fetch(RealmPID, {N, V}) of + {ok, Bin} -> do_import_package(Bin); + upstream -> local_fetch_upstream(PackageID, 0); + Error -> Error + end. + +local_fetch_upstream(PackageID, Tries) -> + Realm = element(1, PackageID), + case zomp_node_man:lookup(Realm) of + {ok, NodePID} -> + ok = tell("Found node connector at ~p", [NodePID]), + ok = zomp_node:fetch(NodePID, PackageID), + wait_hops(PackageID); + wait -> + wait_upstream_node(PackageID, Tries); + error -> + {error, bad_realm} + end. + +wait_hops(PackageID) -> + receive + {ok, PackageID, Bin} -> + do_import_package(Bin); + {hops, PackageID, Distance} -> + ok = tell("Fetch in progress. Hops: ~w", [Distance]), + wait_hops(PackageID) + after 60000 -> + {error, timeout} + end. + +wait_upstream_node(PackageID, Tries) when Tries < 10 -> + _ = erlang:send_after(1000, self(), retry), + receive retry -> local_fetch_upstream(PackageID, Tries + 1) end; +wait_upstream_node(_, _) -> + {error, timeout}. + + remote_dispatch([], State) -> State; remote_dispatch([Action = {request, Pid, ID, Message} | Rest], @@ -1628,7 +1676,8 @@ do_fetch(PackageID, Requestor, State = #s{id = ID}) -> Action = {fetch, Realm, Name, Version}, do_request(Requestor, Action, State); Error -> - Requestor ! {result, ID, Error} + Requestor ! {result, ID, Error}, + State end. do_fetch2(Bin, Requestor, ID) -> diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_key.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_key.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.7/src/zx_key.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_key.erl index 32386de..c66a905 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_key.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_key.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_key). --vsn("0.10.7"). +-vsn("0.10.8"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_lib.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_lib.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.7/src/zx_lib.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_lib.erl index 8628152..54d8ce6 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_lib.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_lib.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_lib). --vsn("0.10.7"). +-vsn("0.10.8"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_local.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_local.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.7/src/zx_local.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_local.erl index 2544a21..5832a6f 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_local.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_local.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_local). --vsn("0.10.7"). +-vsn("0.10.8"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_net.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_net.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.7/src/zx_net.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_net.erl index fe1a7a5..786a5a7 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_net.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_net.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_net). --vsn("0.10.7"). +-vsn("0.10.8"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_peer.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_peer.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.7/src/zx_peer.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_peer.erl index 4f906dc..6a44444 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_peer.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_peer.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_peer). --vsn("0.10.7"). +-vsn("0.10.8"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). @@ -166,7 +166,7 @@ handle_message(<>) -> 9 -> deferred(fun zx_daemon:search/1, Payload); 10 -> deferred(fun zx_daemon:list_deps/1, Payload); 11 -> deferred(fun zx_daemon:list_sysops/1, Payload); - 12 -> zx_daemon:fetch(Payload); + 12 -> deferred(fun zx_daemon:fetch/1, Payload); 13 -> zx_daemon:keychain(Payload); 14 -> zx_daemon:install(Payload); 15 -> zx_daemon:build(Payload); diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_peer_man.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_peer_man.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.7/src/zx_peer_man.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_peer_man.erl index f2a5653..a04b63a 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_peer_man.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_peer_man.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_peer_man). --vsn("0.10.7"). +-vsn("0.10.8"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_peer_sup.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_peer_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.7/src/zx_peer_sup.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_peer_sup.erl index 733493d..e4602c9 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_peer_sup.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_peer_sup.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_peer_sup). --vsn("0.10.7"). +-vsn("0.10.8"). -behaviour(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_peers.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_peers.erl similarity index 98% rename from zomp/lib/otpr/zx/0.10.7/src/zx_peers.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_peers.erl index 91d8954..be312eb 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_peers.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_peers.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_peers). --vsn("0.10.7"). +-vsn("0.10.8"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_proxy.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_proxy.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.7/src/zx_proxy.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_proxy.erl index d70d6a1..e8d7635 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_proxy.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_proxy.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_proxy). --vsn("0.10.7"). +-vsn("0.10.8"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_sup.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.7/src/zx_sup.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_sup.erl index ac171a6..0d92b3c 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_sup.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_sup). --vsn("0.10.7"). +-vsn("0.10.8"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_tty.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_tty.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.7/src/zx_tty.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_tty.erl index 78260fa..6f361e6 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_tty.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_tty.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_tty). --vsn("0.10.7"). +-vsn("0.10.8"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_userconf.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_userconf.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.7/src/zx_userconf.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_userconf.erl index ca65ca7..10cab9c 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_userconf.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_userconf.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_userconf). --vsn("0.10.7"). +-vsn("0.10.8"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.7/src/zx_zsp.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_zsp.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.7/src/zx_zsp.erl rename to zomp/lib/otpr/zx/0.10.8/src/zx_zsp.erl index a1286e3..1239840 100644 --- a/zomp/lib/otpr/zx/0.10.7/src/zx_zsp.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_zsp.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_zsp). --vsn("0.10.7"). +-vsn("0.10.8"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.7/templates/Emakefile b/zomp/lib/otpr/zx/0.10.8/templates/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/Emakefile rename to zomp/lib/otpr/zx/0.10.8/templates/Emakefile diff --git a/zomp/lib/otpr/zx/0.10.7/templates/boringlib/funfile.erl b/zomp/lib/otpr/zx/0.10.8/templates/boringlib/funfile.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/boringlib/funfile.erl rename to zomp/lib/otpr/zx/0.10.8/templates/boringlib/funfile.erl diff --git a/zomp/lib/otpr/zx/0.10.7/templates/escript b/zomp/lib/otpr/zx/0.10.8/templates/escript similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/escript rename to zomp/lib/otpr/zx/0.10.8/templates/escript diff --git a/zomp/lib/otpr/zx/0.10.7/templates/example_server/appmod.erl b/zomp/lib/otpr/zx/0.10.8/templates/example_server/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/example_server/appmod.erl rename to zomp/lib/otpr/zx/0.10.8/templates/example_server/appmod.erl diff --git a/zomp/lib/otpr/zx/0.10.7/templates/example_server/src/_client.erl b/zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_client.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/example_server/src/_client.erl rename to zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_client.erl diff --git a/zomp/lib/otpr/zx/0.10.7/templates/example_server/src/_client_man.erl b/zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_client_man.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/example_server/src/_client_man.erl rename to zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_client_man.erl diff --git a/zomp/lib/otpr/zx/0.10.7/templates/example_server/src/_client_sup.erl b/zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_client_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/example_server/src/_client_sup.erl rename to zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_client_sup.erl diff --git a/zomp/lib/otpr/zx/0.10.7/templates/example_server/src/_clients.erl b/zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_clients.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/example_server/src/_clients.erl rename to zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_clients.erl diff --git a/zomp/lib/otpr/zx/0.10.7/templates/example_server/src/_sup.erl b/zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/example_server/src/_sup.erl rename to zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_sup.erl diff --git a/zomp/lib/otpr/zx/0.10.7/templates/gitignore b/zomp/lib/otpr/zx/0.10.8/templates/gitignore similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/gitignore rename to zomp/lib/otpr/zx/0.10.8/templates/gitignore diff --git a/zomp/lib/otpr/zx/0.10.7/templates/hellowx/appmod.erl b/zomp/lib/otpr/zx/0.10.8/templates/hellowx/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/hellowx/appmod.erl rename to zomp/lib/otpr/zx/0.10.8/templates/hellowx/appmod.erl diff --git a/zomp/lib/otpr/zx/0.10.7/templates/hellowx/src/_con.erl b/zomp/lib/otpr/zx/0.10.8/templates/hellowx/src/_con.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/hellowx/src/_con.erl rename to zomp/lib/otpr/zx/0.10.8/templates/hellowx/src/_con.erl diff --git a/zomp/lib/otpr/zx/0.10.7/templates/hellowx/src/_gui.erl b/zomp/lib/otpr/zx/0.10.8/templates/hellowx/src/_gui.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/hellowx/src/_gui.erl rename to zomp/lib/otpr/zx/0.10.8/templates/hellowx/src/_gui.erl diff --git a/zomp/lib/otpr/zx/0.10.7/templates/hellowx/src/_sup.erl b/zomp/lib/otpr/zx/0.10.8/templates/hellowx/src/_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/hellowx/src/_sup.erl rename to zomp/lib/otpr/zx/0.10.8/templates/hellowx/src/_sup.erl diff --git a/zomp/lib/otpr/zx/0.10.7/templates/licenses/apache2.txt b/zomp/lib/otpr/zx/0.10.8/templates/licenses/apache2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/licenses/apache2.txt rename to zomp/lib/otpr/zx/0.10.8/templates/licenses/apache2.txt diff --git a/zomp/lib/otpr/zx/0.10.7/templates/licenses/bsd2.txt b/zomp/lib/otpr/zx/0.10.8/templates/licenses/bsd2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/licenses/bsd2.txt rename to zomp/lib/otpr/zx/0.10.8/templates/licenses/bsd2.txt diff --git a/zomp/lib/otpr/zx/0.10.7/templates/licenses/bsd3.txt b/zomp/lib/otpr/zx/0.10.8/templates/licenses/bsd3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/licenses/bsd3.txt rename to zomp/lib/otpr/zx/0.10.8/templates/licenses/bsd3.txt diff --git a/zomp/lib/otpr/zx/0.10.7/templates/licenses/cc0.txt b/zomp/lib/otpr/zx/0.10.8/templates/licenses/cc0.txt similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/licenses/cc0.txt rename to zomp/lib/otpr/zx/0.10.8/templates/licenses/cc0.txt diff --git a/zomp/lib/otpr/zx/0.10.7/templates/licenses/gpl3.txt b/zomp/lib/otpr/zx/0.10.8/templates/licenses/gpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/licenses/gpl3.txt rename to zomp/lib/otpr/zx/0.10.8/templates/licenses/gpl3.txt diff --git a/zomp/lib/otpr/zx/0.10.7/templates/licenses/lgpl3.txt b/zomp/lib/otpr/zx/0.10.8/templates/licenses/lgpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/licenses/lgpl3.txt rename to zomp/lib/otpr/zx/0.10.8/templates/licenses/lgpl3.txt diff --git a/zomp/lib/otpr/zx/0.10.7/templates/licenses/mit.txt b/zomp/lib/otpr/zx/0.10.8/templates/licenses/mit.txt similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/licenses/mit.txt rename to zomp/lib/otpr/zx/0.10.8/templates/licenses/mit.txt diff --git a/zomp/lib/otpr/zx/0.10.7/templates/licenses/mpl2.txt b/zomp/lib/otpr/zx/0.10.8/templates/licenses/mpl2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/licenses/mpl2.txt rename to zomp/lib/otpr/zx/0.10.8/templates/licenses/mpl2.txt diff --git a/zomp/lib/otpr/zx/0.10.7/templates/simplecli.erl b/zomp/lib/otpr/zx/0.10.8/templates/simplecli.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.7/templates/simplecli.erl rename to zomp/lib/otpr/zx/0.10.8/templates/simplecli.erl diff --git a/zomp/lib/otpr/zx/0.10.7/zomp.meta b/zomp/lib/otpr/zx/0.10.8/zomp.meta similarity index 91% rename from zomp/lib/otpr/zx/0.10.7/zomp.meta rename to zomp/lib/otpr/zx/0.10.8/zomp.meta index 20e9984..e83359a 100644 --- a/zomp/lib/otpr/zx/0.10.7/zomp.meta +++ b/zomp/lib/otpr/zx/0.10.8/zomp.meta @@ -9,7 +9,7 @@ {license,"MIT"}. {modules,[]}. {name,"zx"}. -{package_id,{"otpr","zx",{0,10,7}}}. +{package_id,{"otpr","zx",{0,10,8}}}. {prefix,"zx_"}. {repo_url,"https://gitlab.com/zxq9/zx"}. {tags,["tools","package manager","erlang"]}. From 6f43712a400ca30ef287f3e49baf86ac2b654b74 Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Tue, 16 Jun 2020 16:08:36 +0900 Subject: [PATCH 2/3] Fix instruction message --- zomp/lib/otpr/zx/0.10.8/src/zx_local.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_local.erl b/zomp/lib/otpr/zx/0.10.8/src/zx_local.erl index 5832a6f..33e2533 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_local.erl +++ b/zomp/lib/otpr/zx/0.10.8/src/zx_local.erl @@ -1937,7 +1937,7 @@ store_realm(#realm_init{realm = Realm, "3. Become the prime node: `zx takeover ~ts`~n" "~n" "ZX CLIENT and ZOMP DISTRIBUTION NODE configuration requires one command:~n" - "1. Configure the realm: `zx add realm ~ts`~n" + "1. Configure the realm: `zx import realm ~ts`~n" "~n" "How to distribute ~ts is up to you.~n" "=============================================================================~n", From 65824583ab340fb4b9f263e9484cace671009ffe Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Wed, 17 Jun 2020 07:23:19 +0900 Subject: [PATCH 3/3] Use public_key instead of os:cmd/1 to openssl for key generation. --- zomp/etc/version.txt | 2 +- zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/Emakefile | 0 zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/LICENSE | 0 .../otpr/zx/{0.10.8 => 0.10.9}/ebin/zx.app | 2 +- .../{0.10.8 => 0.10.9}/include/zx_logger.hrl | 0 .../otpr/zx/{0.10.8 => 0.10.9}/launcher.png | Bin zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/make_zx | 0 .../lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx.erl | 2 +- .../zx/{0.10.8 => 0.10.9}/src/zx_auth.erl | 2 +- .../zx/{0.10.8 => 0.10.9}/src/zx_conn.erl | 2 +- .../zx/{0.10.8 => 0.10.9}/src/zx_conn_sup.erl | 2 +- .../zx/{0.10.8 => 0.10.9}/src/zx_daemon.erl | 2 +- .../otpr/zx/{0.10.8 => 0.10.9}/src/zx_key.erl | 122 ++---------------- .../otpr/zx/{0.10.8 => 0.10.9}/src/zx_lib.erl | 2 +- .../zx/{0.10.8 => 0.10.9}/src/zx_local.erl | 2 +- .../otpr/zx/{0.10.8 => 0.10.9}/src/zx_net.erl | 2 +- .../zx/{0.10.8 => 0.10.9}/src/zx_peer.erl | 2 +- .../zx/{0.10.8 => 0.10.9}/src/zx_peer_man.erl | 2 +- .../zx/{0.10.8 => 0.10.9}/src/zx_peer_sup.erl | 2 +- .../zx/{0.10.8 => 0.10.9}/src/zx_peers.erl | 2 +- .../zx/{0.10.8 => 0.10.9}/src/zx_proxy.erl | 2 +- .../otpr/zx/{0.10.8 => 0.10.9}/src/zx_sup.erl | 2 +- .../otpr/zx/{0.10.8 => 0.10.9}/src/zx_tty.erl | 2 +- .../zx/{0.10.8 => 0.10.9}/src/zx_userconf.erl | 2 +- .../otpr/zx/{0.10.8 => 0.10.9}/src/zx_zsp.erl | 2 +- .../zx/{0.10.8 => 0.10.9}/templates/Emakefile | 0 .../templates/boringlib/funfile.erl | 0 .../zx/{0.10.8 => 0.10.9}/templates/escript | 0 .../templates/example_server/appmod.erl | 0 .../templates/example_server/src/_client.erl | 0 .../example_server/src/_client_man.erl | 0 .../example_server/src/_client_sup.erl | 0 .../templates/example_server/src/_clients.erl | 0 .../templates/example_server/src/_sup.erl | 0 .../zx/{0.10.8 => 0.10.9}/templates/gitignore | 0 .../templates/hellowx/appmod.erl | 0 .../templates/hellowx/src/_con.erl | 0 .../templates/hellowx/src/_gui.erl | 0 .../templates/hellowx/src/_sup.erl | 0 .../templates/licenses/apache2.txt | 0 .../templates/licenses/bsd2.txt | 0 .../templates/licenses/bsd3.txt | 0 .../templates/licenses/cc0.txt | 0 .../templates/licenses/gpl3.txt | 0 .../templates/licenses/lgpl3.txt | 0 .../templates/licenses/mit.txt | 0 .../templates/licenses/mpl2.txt | 0 .../templates/simplecli.erl | 0 zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/zomp.meta | 2 +- 49 files changed, 34 insertions(+), 128 deletions(-) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/Emakefile (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/LICENSE (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/ebin/zx.app (93%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/include/zx_logger.hrl (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/launcher.png (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/make_zx (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx.erl (99%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_auth.erl (99%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_conn.erl (99%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_conn_sup.erl (99%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_daemon.erl (99%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_key.erl (54%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_lib.erl (99%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_local.erl (99%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_net.erl (99%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_peer.erl (99%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_peer_man.erl (99%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_peer_sup.erl (99%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_peers.erl (98%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_proxy.erl (99%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_sup.erl (99%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_tty.erl (99%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_userconf.erl (99%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/src/zx_zsp.erl (99%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/Emakefile (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/boringlib/funfile.erl (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/escript (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/example_server/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/example_server/src/_client.erl (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/example_server/src/_client_man.erl (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/example_server/src/_client_sup.erl (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/example_server/src/_clients.erl (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/example_server/src/_sup.erl (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/gitignore (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/hellowx/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/hellowx/src/_con.erl (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/hellowx/src/_gui.erl (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/hellowx/src/_sup.erl (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/licenses/apache2.txt (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/licenses/bsd2.txt (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/licenses/bsd3.txt (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/licenses/cc0.txt (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/licenses/gpl3.txt (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/licenses/lgpl3.txt (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/licenses/mit.txt (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/licenses/mpl2.txt (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/templates/simplecli.erl (100%) rename zomp/lib/otpr/zx/{0.10.8 => 0.10.9}/zomp.meta (91%) diff --git a/zomp/etc/version.txt b/zomp/etc/version.txt index 1a46c7f..f314d02 100644 --- a/zomp/etc/version.txt +++ b/zomp/etc/version.txt @@ -1 +1 @@ -0.10.8 +0.10.9 diff --git a/zomp/lib/otpr/zx/0.10.8/Emakefile b/zomp/lib/otpr/zx/0.10.9/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/Emakefile rename to zomp/lib/otpr/zx/0.10.9/Emakefile diff --git a/zomp/lib/otpr/zx/0.10.8/LICENSE b/zomp/lib/otpr/zx/0.10.9/LICENSE similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/LICENSE rename to zomp/lib/otpr/zx/0.10.9/LICENSE diff --git a/zomp/lib/otpr/zx/0.10.8/ebin/zx.app b/zomp/lib/otpr/zx/0.10.9/ebin/zx.app similarity index 93% rename from zomp/lib/otpr/zx/0.10.8/ebin/zx.app rename to zomp/lib/otpr/zx/0.10.9/ebin/zx.app index 8ccb958..73a9521 100644 --- a/zomp/lib/otpr/zx/0.10.8/ebin/zx.app +++ b/zomp/lib/otpr/zx/0.10.9/ebin/zx.app @@ -1,6 +1,6 @@ {application,zx, [{description,"An Erlang development tool and Zomp user client"}, - {vsn,"0.10.8"}, + {vsn,"0.10.9"}, {applications,[stdlib,kernel]}, {modules,[zx,zx_auth,zx_conn,zx_conn_sup,zx_daemon,zx_key, zx_lib,zx_local,zx_net,zx_peer,zx_peer_man, diff --git a/zomp/lib/otpr/zx/0.10.8/include/zx_logger.hrl b/zomp/lib/otpr/zx/0.10.9/include/zx_logger.hrl similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/include/zx_logger.hrl rename to zomp/lib/otpr/zx/0.10.9/include/zx_logger.hrl diff --git a/zomp/lib/otpr/zx/0.10.8/launcher.png b/zomp/lib/otpr/zx/0.10.9/launcher.png similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/launcher.png rename to zomp/lib/otpr/zx/0.10.9/launcher.png diff --git a/zomp/lib/otpr/zx/0.10.8/make_zx b/zomp/lib/otpr/zx/0.10.9/make_zx similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/make_zx rename to zomp/lib/otpr/zx/0.10.9/make_zx diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx.erl b/zomp/lib/otpr/zx/0.10.9/src/zx.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.8/src/zx.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx.erl index f16c1ab..f9add09 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx.erl @@ -24,7 +24,7 @@ %%% @end -module(zx). --vsn("0.10.8"). +-vsn("0.10.9"). -behavior(application). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_auth.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_auth.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.8/src/zx_auth.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_auth.erl index 7edbffe..25810ed 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_auth.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_auth.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_auth). --vsn("0.10.8"). +-vsn("0.10.9"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_conn.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_conn.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.8/src/zx_conn.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_conn.erl index 7860ecd..43954f1 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_conn.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_conn.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_conn). --vsn("0.10.8"). +-vsn("0.10.9"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_conn_sup.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_conn_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.8/src/zx_conn_sup.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_conn_sup.erl index 0d92d47..20b9b5e 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_conn_sup.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_conn_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_conn_sup). --vsn("0.10.8"). +-vsn("0.10.9"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_daemon.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_daemon.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.8/src/zx_daemon.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_daemon.erl index d8ac3a5..2fddef8 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_daemon.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_daemon.erl @@ -138,7 +138,7 @@ %%% @end -module(zx_daemon). --vsn("0.10.8"). +-vsn("0.10.9"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_key.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_key.erl similarity index 54% rename from zomp/lib/otpr/zx/0.10.8/src/zx_key.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_key.erl index c66a905..13ec7da 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_key.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_key.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_key). --vsn("0.10.8"). +-vsn("0.10.9"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). @@ -20,6 +20,7 @@ sign/2, verify/3]). -include("zx_logger.hrl"). +-include_lib("public_key/include/OTP-PUB-KEY.hrl"). -spec generate_rsa(Owner) -> Result @@ -32,125 +33,30 @@ %% NOTE: The current version of this command is likely to only work on a unix system. generate_rsa(Owner) -> - {ok, TmpDir} = zx_lib:mktemp_dir({"otpr", "zx"}), - PemFile = filename:join(TmpDir, "zx-tmp.pem"), - PubFile = filename:join(TmpDir, "zx-tmp.pub.der"), - KeyFile = filename:join(TmpDir, "zx-tmp.key.der"), - ok = tell("Generating keys. Please be patient..."), - case gen_p_key(KeyFile) of - ok -> - ok = der_to_pem(KeyFile, PemFile), - {ok, PemBin} = file:read_file(PemFile), - [PemData] = public_key:pem_decode(PemBin), - Pub = public_key:pem_entry_decode(PemData), - PubDer = public_key:der_encode('RSAPublicKey', Pub), - ok = file:write_file(PubFile, PubDer), - generate_rsa2(Owner, PemFile, KeyFile, PubFile); - {error, no_ssl} -> - ok = tell(error, "OpenSSL not found."), - {error, keygen_fail} - end. - -generate_rsa2(Owner, PemFile, KeyFile, PubFile) -> - {ok, PubBin} = file:read_file(PubFile), - {ok, KeyBin} = file:read_file(KeyFile), - Pub = public_key:der_decode('RSAPublicKey', PubBin), - Key = public_key:der_decode('RSAPrivateKey', KeyBin), + ok = tell("Generating keys. This can take several minutes. Please be patient..."), + Key = + #'RSAPrivateKey'{modulus = Mod, + publicExponent = PE} = + public_key:generate_key({rsa, 16384, 65537}), + Pub = + #'RSAPublicKey'{modulus = Mod, + publicExponent = PE}, TestMessage = <<"Some test data to sign.">>, Signature = public_key:sign(TestMessage, sha512, Key), case public_key:verify(TestMessage, sha512, Signature, Pub) of true -> - PubHash = crypto:hash(sha512, PubBin), - KeyData = {PubHash, {none, PubBin}, {none, KeyBin}}, + KeyDER = public_key:der_encode('RSAPrivateKey', Key), + PubDER = public_key:der_encode('RSAPublicKey', Pub), + PubHash = crypto:hash(sha512, PubDER), + KeyData = {PubHash, {none, PubDER}, {none, KeyDER}}, ok = zx_daemon:register_key(Owner, KeyData), - ok = zx_lib:rm_rf(filename:dirname(KeyFile)), {ok, PubHash}; false -> - ok = lists:foreach(fun file:delete/1, [PemFile, KeyFile, PubFile]), ok = tell(error, "Something has gone wrong."), {error, keygen_fail} end. --spec gen_p_key(KeyFile) -> Result - when KeyFile :: file:filename(), - Result :: ok - | {error, no_ssl}. -%% @private -%% Format an openssl shell command that will generate proper 16k RSA keys. - -gen_p_key(KeyFile) -> - case openssl() of - {ok, OpenSSL} -> - Command = - io_lib:format("~ts genpkey" - " -algorithm rsa" - " -out ~ts" - " -outform DER" - " -pkeyopt rsa_keygen_bits:16384", - [OpenSSL, KeyFile]), - Out = os:cmd(Command), - io:format(Out); - Error -> - Error - end. - - --spec der_to_pem(KeyFile, PemFile) -> ok - when KeyFile :: file:filename(), - PemFile :: file:filename(). -%% @private -%% Format an openssl shell command that will convert the given keyfile to a pemfile. -%% The reason for this conversion is to sidestep some formatting weirdness that OpenSSL -%% injects into its generated DER formatted key output (namely, a few empty headers) -%% which Erlang's ASN.1 defintion files do not take into account. A conversion to PEM -%% then a conversion back to DER (via Erlang's ASN.1 module) resolves this in a reliable -%% way. - -der_to_pem(KeyFile, PemFile) -> - case openssl() of - {ok, OpenSSL} -> - Command = - io_lib:format("~ts rsa" - " -inform DER" - " -in ~ts" - " -outform PEM" - " -pubout" - " -out ~ts", - [OpenSSL, KeyFile, PemFile]), - Out = os:cmd(Command), - io:format(Out); - Error -> - Error - end. - - --spec openssl() -> Result - when Result :: {ok, Executable} - | {error, no_ssl}, - Executable :: file:filename(). -%% @private -%% Attempt to locate the installed openssl executable for use in shell commands. -%% TODO: Determine whether it is even worth it to perform this check VS restricting -%% os:cmd/1 directed zx_key functions by platform. - -openssl() -> - OpenSSL = - case os:type() of - {unix, _} -> "openssl"; - {win32, _} -> "openssl.exe" - end, - case os:find_executable(OpenSSL) of - false -> - M = "OpenSSL not foud in PATH. Install OpenSSL or add to path and retry.", - ok = tell(error, M), - {error, no_ssl}; - Path -> - ok = tell("OpenSSL executable found at: ~ts", [Path]), - {ok, OpenSSL} - end. - - -spec save(Type, KeyID, Key) -> Result when Type :: private | public, KeyID :: zx:key_id(), diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_lib.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_lib.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.8/src/zx_lib.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_lib.erl index 54d8ce6..b82f969 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_lib.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_lib.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_lib). --vsn("0.10.8"). +-vsn("0.10.9"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_local.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_local.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.8/src/zx_local.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_local.erl index 33e2533..4015b74 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_local.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_local.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_local). --vsn("0.10.8"). +-vsn("0.10.9"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_net.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_net.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.8/src/zx_net.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_net.erl index 786a5a7..cec78a8 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_net.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_net.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_net). --vsn("0.10.8"). +-vsn("0.10.9"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_peer.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_peer.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.8/src/zx_peer.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_peer.erl index 6a44444..56f5ff5 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_peer.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_peer.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_peer). --vsn("0.10.8"). +-vsn("0.10.9"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_peer_man.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_peer_man.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.8/src/zx_peer_man.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_peer_man.erl index a04b63a..7f7875d 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_peer_man.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_peer_man.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_peer_man). --vsn("0.10.8"). +-vsn("0.10.9"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_peer_sup.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_peer_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.8/src/zx_peer_sup.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_peer_sup.erl index e4602c9..26a2e5f 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_peer_sup.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_peer_sup.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_peer_sup). --vsn("0.10.8"). +-vsn("0.10.9"). -behaviour(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_peers.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_peers.erl similarity index 98% rename from zomp/lib/otpr/zx/0.10.8/src/zx_peers.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_peers.erl index be312eb..f7ec836 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_peers.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_peers.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_peers). --vsn("0.10.8"). +-vsn("0.10.9"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_proxy.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_proxy.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.8/src/zx_proxy.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_proxy.erl index e8d7635..5e0fef4 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_proxy.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_proxy.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_proxy). --vsn("0.10.8"). +-vsn("0.10.9"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_sup.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.8/src/zx_sup.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_sup.erl index 0d92b3c..7d6fe23 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_sup.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_sup). --vsn("0.10.8"). +-vsn("0.10.9"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_tty.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_tty.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.8/src/zx_tty.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_tty.erl index 6f361e6..ea90bfd 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_tty.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_tty.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_tty). --vsn("0.10.8"). +-vsn("0.10.9"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_userconf.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_userconf.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.8/src/zx_userconf.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_userconf.erl index 10cab9c..8ef7d32 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_userconf.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_userconf.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_userconf). --vsn("0.10.8"). +-vsn("0.10.9"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.8/src/zx_zsp.erl b/zomp/lib/otpr/zx/0.10.9/src/zx_zsp.erl similarity index 99% rename from zomp/lib/otpr/zx/0.10.8/src/zx_zsp.erl rename to zomp/lib/otpr/zx/0.10.9/src/zx_zsp.erl index 1239840..ddc8927 100644 --- a/zomp/lib/otpr/zx/0.10.8/src/zx_zsp.erl +++ b/zomp/lib/otpr/zx/0.10.9/src/zx_zsp.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_zsp). --vsn("0.10.8"). +-vsn("0.10.9"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.10.8/templates/Emakefile b/zomp/lib/otpr/zx/0.10.9/templates/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/Emakefile rename to zomp/lib/otpr/zx/0.10.9/templates/Emakefile diff --git a/zomp/lib/otpr/zx/0.10.8/templates/boringlib/funfile.erl b/zomp/lib/otpr/zx/0.10.9/templates/boringlib/funfile.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/boringlib/funfile.erl rename to zomp/lib/otpr/zx/0.10.9/templates/boringlib/funfile.erl diff --git a/zomp/lib/otpr/zx/0.10.8/templates/escript b/zomp/lib/otpr/zx/0.10.9/templates/escript similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/escript rename to zomp/lib/otpr/zx/0.10.9/templates/escript diff --git a/zomp/lib/otpr/zx/0.10.8/templates/example_server/appmod.erl b/zomp/lib/otpr/zx/0.10.9/templates/example_server/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/example_server/appmod.erl rename to zomp/lib/otpr/zx/0.10.9/templates/example_server/appmod.erl diff --git a/zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_client.erl b/zomp/lib/otpr/zx/0.10.9/templates/example_server/src/_client.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_client.erl rename to zomp/lib/otpr/zx/0.10.9/templates/example_server/src/_client.erl diff --git a/zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_client_man.erl b/zomp/lib/otpr/zx/0.10.9/templates/example_server/src/_client_man.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_client_man.erl rename to zomp/lib/otpr/zx/0.10.9/templates/example_server/src/_client_man.erl diff --git a/zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_client_sup.erl b/zomp/lib/otpr/zx/0.10.9/templates/example_server/src/_client_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_client_sup.erl rename to zomp/lib/otpr/zx/0.10.9/templates/example_server/src/_client_sup.erl diff --git a/zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_clients.erl b/zomp/lib/otpr/zx/0.10.9/templates/example_server/src/_clients.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_clients.erl rename to zomp/lib/otpr/zx/0.10.9/templates/example_server/src/_clients.erl diff --git a/zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_sup.erl b/zomp/lib/otpr/zx/0.10.9/templates/example_server/src/_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/example_server/src/_sup.erl rename to zomp/lib/otpr/zx/0.10.9/templates/example_server/src/_sup.erl diff --git a/zomp/lib/otpr/zx/0.10.8/templates/gitignore b/zomp/lib/otpr/zx/0.10.9/templates/gitignore similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/gitignore rename to zomp/lib/otpr/zx/0.10.9/templates/gitignore diff --git a/zomp/lib/otpr/zx/0.10.8/templates/hellowx/appmod.erl b/zomp/lib/otpr/zx/0.10.9/templates/hellowx/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/hellowx/appmod.erl rename to zomp/lib/otpr/zx/0.10.9/templates/hellowx/appmod.erl diff --git a/zomp/lib/otpr/zx/0.10.8/templates/hellowx/src/_con.erl b/zomp/lib/otpr/zx/0.10.9/templates/hellowx/src/_con.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/hellowx/src/_con.erl rename to zomp/lib/otpr/zx/0.10.9/templates/hellowx/src/_con.erl diff --git a/zomp/lib/otpr/zx/0.10.8/templates/hellowx/src/_gui.erl b/zomp/lib/otpr/zx/0.10.9/templates/hellowx/src/_gui.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/hellowx/src/_gui.erl rename to zomp/lib/otpr/zx/0.10.9/templates/hellowx/src/_gui.erl diff --git a/zomp/lib/otpr/zx/0.10.8/templates/hellowx/src/_sup.erl b/zomp/lib/otpr/zx/0.10.9/templates/hellowx/src/_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/hellowx/src/_sup.erl rename to zomp/lib/otpr/zx/0.10.9/templates/hellowx/src/_sup.erl diff --git a/zomp/lib/otpr/zx/0.10.8/templates/licenses/apache2.txt b/zomp/lib/otpr/zx/0.10.9/templates/licenses/apache2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/licenses/apache2.txt rename to zomp/lib/otpr/zx/0.10.9/templates/licenses/apache2.txt diff --git a/zomp/lib/otpr/zx/0.10.8/templates/licenses/bsd2.txt b/zomp/lib/otpr/zx/0.10.9/templates/licenses/bsd2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/licenses/bsd2.txt rename to zomp/lib/otpr/zx/0.10.9/templates/licenses/bsd2.txt diff --git a/zomp/lib/otpr/zx/0.10.8/templates/licenses/bsd3.txt b/zomp/lib/otpr/zx/0.10.9/templates/licenses/bsd3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/licenses/bsd3.txt rename to zomp/lib/otpr/zx/0.10.9/templates/licenses/bsd3.txt diff --git a/zomp/lib/otpr/zx/0.10.8/templates/licenses/cc0.txt b/zomp/lib/otpr/zx/0.10.9/templates/licenses/cc0.txt similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/licenses/cc0.txt rename to zomp/lib/otpr/zx/0.10.9/templates/licenses/cc0.txt diff --git a/zomp/lib/otpr/zx/0.10.8/templates/licenses/gpl3.txt b/zomp/lib/otpr/zx/0.10.9/templates/licenses/gpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/licenses/gpl3.txt rename to zomp/lib/otpr/zx/0.10.9/templates/licenses/gpl3.txt diff --git a/zomp/lib/otpr/zx/0.10.8/templates/licenses/lgpl3.txt b/zomp/lib/otpr/zx/0.10.9/templates/licenses/lgpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/licenses/lgpl3.txt rename to zomp/lib/otpr/zx/0.10.9/templates/licenses/lgpl3.txt diff --git a/zomp/lib/otpr/zx/0.10.8/templates/licenses/mit.txt b/zomp/lib/otpr/zx/0.10.9/templates/licenses/mit.txt similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/licenses/mit.txt rename to zomp/lib/otpr/zx/0.10.9/templates/licenses/mit.txt diff --git a/zomp/lib/otpr/zx/0.10.8/templates/licenses/mpl2.txt b/zomp/lib/otpr/zx/0.10.9/templates/licenses/mpl2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/licenses/mpl2.txt rename to zomp/lib/otpr/zx/0.10.9/templates/licenses/mpl2.txt diff --git a/zomp/lib/otpr/zx/0.10.8/templates/simplecli.erl b/zomp/lib/otpr/zx/0.10.9/templates/simplecli.erl similarity index 100% rename from zomp/lib/otpr/zx/0.10.8/templates/simplecli.erl rename to zomp/lib/otpr/zx/0.10.9/templates/simplecli.erl diff --git a/zomp/lib/otpr/zx/0.10.8/zomp.meta b/zomp/lib/otpr/zx/0.10.9/zomp.meta similarity index 91% rename from zomp/lib/otpr/zx/0.10.8/zomp.meta rename to zomp/lib/otpr/zx/0.10.9/zomp.meta index e83359a..4dcd60a 100644 --- a/zomp/lib/otpr/zx/0.10.8/zomp.meta +++ b/zomp/lib/otpr/zx/0.10.9/zomp.meta @@ -9,7 +9,7 @@ {license,"MIT"}. {modules,[]}. {name,"zx"}. -{package_id,{"otpr","zx",{0,10,8}}}. +{package_id,{"otpr","zx",{0,10,9}}}. {prefix,"zx_"}. {repo_url,"https://gitlab.com/zxq9/zx"}. {tags,["tools","package manager","erlang"]}.