From 894edbe39e2ed512dd1fcf914889cd65b5002b3e Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Fri, 10 Jan 2020 20:56:48 +0900 Subject: [PATCH] Clean up external program API. --- zomp/etc/version.txt | 2 +- zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/Emakefile | 0 zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/LICENSE | 0 zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/ebin/zx.app | 2 +- .../zx/{0.7.2 => 0.8.0}/include/zx_logger.hrl | 0 zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/make_zx | 0 zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx.erl | 15 +++++------ .../otpr/zx/{0.7.2 => 0.8.0}/src/zx_auth.erl | 2 +- .../otpr/zx/{0.7.2 => 0.8.0}/src/zx_conn.erl | 2 +- .../zx/{0.7.2 => 0.8.0}/src/zx_conn_sup.erl | 2 +- .../zx/{0.7.2 => 0.8.0}/src/zx_daemon.erl | 2 +- .../otpr/zx/{0.7.2 => 0.8.0}/src/zx_key.erl | 2 +- .../otpr/zx/{0.7.2 => 0.8.0}/src/zx_lib.erl | 2 +- .../otpr/zx/{0.7.2 => 0.8.0}/src/zx_local.erl | 26 +++++++++---------- .../otpr/zx/{0.7.2 => 0.8.0}/src/zx_net.erl | 2 +- .../otpr/zx/{0.7.2 => 0.8.0}/src/zx_peer.erl | 2 +- .../zx/{0.7.2 => 0.8.0}/src/zx_peer_man.erl | 2 +- .../zx/{0.7.2 => 0.8.0}/src/zx_peer_sup.erl | 2 +- .../otpr/zx/{0.7.2 => 0.8.0}/src/zx_peers.erl | 2 +- .../otpr/zx/{0.7.2 => 0.8.0}/src/zx_proxy.erl | 2 +- .../otpr/zx/{0.7.2 => 0.8.0}/src/zx_sup.erl | 2 +- .../otpr/zx/{0.7.2 => 0.8.0}/src/zx_tty.erl | 2 +- .../zx/{0.7.2 => 0.8.0}/src/zx_userconf.erl | 2 +- .../otpr/zx/{0.7.2 => 0.8.0}/src/zx_zsp.erl | 2 +- .../zx/{0.7.2 => 0.8.0}/templates/Emakefile | 0 .../templates/boringlib/funfile.erl | 0 .../zx/{0.7.2 => 0.8.0}/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.7.2 => 0.8.0}/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 .../{0.7.2 => 0.8.0}/templates/simplecli.erl | 0 zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/zomp.meta | 2 +- 48 files changed, 38 insertions(+), 41 deletions(-) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/Emakefile (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/LICENSE (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/ebin/zx.app (93%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/include/zx_logger.hrl (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/make_zx (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_auth.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_conn.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_conn_sup.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_daemon.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_key.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_lib.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_local.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_net.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_peer.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_peer_man.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_peer_sup.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_peers.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_proxy.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_sup.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_tty.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_userconf.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/src/zx_zsp.erl (99%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/Emakefile (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/boringlib/funfile.erl (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/escript (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/example_server/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/example_server/src/client.erl (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/example_server/src/client_man.erl (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/example_server/src/client_sup.erl (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/example_server/src/clients.erl (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/example_server/src/sup.erl (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/gitignore (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/hellowx/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/hellowx/src/con.erl (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/hellowx/src/gui.erl (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/hellowx/src/sup.erl (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/licenses/apache2.txt (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/licenses/bsd2.txt (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/licenses/bsd3.txt (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/licenses/cc0.txt (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/licenses/gpl3.txt (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/licenses/lgpl3.txt (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/licenses/mit.txt (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/licenses/mpl2.txt (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/templates/simplecli.erl (100%) rename zomp/lib/otpr/zx/{0.7.2 => 0.8.0}/zomp.meta (91%) diff --git a/zomp/etc/version.txt b/zomp/etc/version.txt index 7486fdb..a3df0a6 100644 --- a/zomp/etc/version.txt +++ b/zomp/etc/version.txt @@ -1 +1 @@ -0.7.2 +0.8.0 diff --git a/zomp/lib/otpr/zx/0.7.2/Emakefile b/zomp/lib/otpr/zx/0.8.0/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/Emakefile rename to zomp/lib/otpr/zx/0.8.0/Emakefile diff --git a/zomp/lib/otpr/zx/0.7.2/LICENSE b/zomp/lib/otpr/zx/0.8.0/LICENSE similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/LICENSE rename to zomp/lib/otpr/zx/0.8.0/LICENSE diff --git a/zomp/lib/otpr/zx/0.7.2/ebin/zx.app b/zomp/lib/otpr/zx/0.8.0/ebin/zx.app similarity index 93% rename from zomp/lib/otpr/zx/0.7.2/ebin/zx.app rename to zomp/lib/otpr/zx/0.8.0/ebin/zx.app index 635bfd0..7fe263e 100644 --- a/zomp/lib/otpr/zx/0.7.2/ebin/zx.app +++ b/zomp/lib/otpr/zx/0.8.0/ebin/zx.app @@ -1,6 +1,6 @@ {application,zx, [{description,"An Erlang development tool and Zomp user client"}, - {vsn,"0.7.2"}, + {vsn,"0.8.0"}, {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.7.2/include/zx_logger.hrl b/zomp/lib/otpr/zx/0.8.0/include/zx_logger.hrl similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/include/zx_logger.hrl rename to zomp/lib/otpr/zx/0.8.0/include/zx_logger.hrl diff --git a/zomp/lib/otpr/zx/0.7.2/make_zx b/zomp/lib/otpr/zx/0.8.0/make_zx similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/make_zx rename to zomp/lib/otpr/zx/0.8.0/make_zx diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx.erl b/zomp/lib/otpr/zx/0.8.0/src/zx.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx.erl index aadd45e..15db14c 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx.erl @@ -24,7 +24,7 @@ %%% @end -module(zx). --vsn("0.7.2"). +-vsn("0.8.0"). -behavior(application). -author("Craig Everett "). -copyright("Craig Everett "). @@ -35,7 +35,7 @@ -export([run/2, not_done/1, done/1, subscribe/1, unsubscribe/0, list/0, list/1, list/2, list/3, latest/1, - list_type/2, list_type_ar/2, describe/1, describe_plural/1, + list_type/2, list_type_ar/1, describe/1, describe_plural/1, stop/0, silent_stop/0]). -export([start/2, stop/1]). @@ -598,7 +598,7 @@ list_type(Realm, Type) -> Result :: {ok, [package_id()]} | {error, Unexpected, [Result]} | {error, Reason}, - Unexpected :: {unexpected, {result, id(), term()}}, + Unexpected :: {unexpected, {result, zx_daemon:id(), term()}}, Reason :: bad_realm | bad_package | bad_version @@ -609,7 +609,7 @@ list_type(Realm, Type) -> %% List all packages from all realms that are of `Type'. %% The "_ar" suffix to this function is short for "all realms". -list_type_ar(Targets) -> +list_type_ar(Type) -> Realms = zx_lib:list_realms(), MakeRequest = fun(Realm) -> @@ -633,8 +633,7 @@ scrub_errors([], [], Acc) -> -spec describe(package_id()) -> Result - when Target :: package_id(), - Result :: {ok, description()} + when Result :: {ok, description()} | {error, Reason}, Reason :: bad_realm | bad_package @@ -651,7 +650,7 @@ describe(PackageID) -> when Result :: {ok, [description()]} | {error, Unexpected, [Result]} | {error, Reason}, - Unexpected :: {unexpected, {result, id(), term()}}, + Unexpected :: {unexpected, {result, zx_daemon:id(), term()}}, Reason :: bad_realm | bad_package | bad_version @@ -659,7 +658,7 @@ describe(PackageID) -> | network | {unexpected, Message :: string()}. -describe_plural(PackageIDs) ->odescribe(PackageIDs) -> +describe_plural(PackageIDs) -> Describe = fun(PackageID) -> {ok, ID} = zx_daemon:describe(PackageID), diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_auth.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_auth.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_auth.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_auth.erl index 5d11122..2a0e9e3 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_auth.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_auth.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_auth). --vsn("0.7.2"). +-vsn("0.8.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_conn.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_conn.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_conn.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_conn.erl index 281d1bb..ecfa086 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_conn.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_conn.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_conn). --vsn("0.7.2"). +-vsn("0.8.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_conn_sup.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_conn_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_conn_sup.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_conn_sup.erl index ca7d7f0..e4e0ef9 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_conn_sup.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_conn_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_conn_sup). --vsn("0.7.2"). +-vsn("0.8.0"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_daemon.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_daemon.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_daemon.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_daemon.erl index 8c2d823..091dcf5 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_daemon.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_daemon.erl @@ -138,7 +138,7 @@ %%% @end -module(zx_daemon). --vsn("0.7.2"). +-vsn("0.8.0"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_key.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_key.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_key.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_key.erl index dfeaa30..581f9c2 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_key.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_key.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_key). --vsn("0.7.2"). +-vsn("0.8.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_lib.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_lib.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_lib.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_lib.erl index daff879..468a703 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_lib.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_lib.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_lib). --vsn("0.7.2"). +-vsn("0.8.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_local.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_local.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_local.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_local.erl index d63a33d..aafffc6 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_local.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_local.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_local). --vsn("0.7.2"). +-vsn("0.8.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). @@ -1883,20 +1883,23 @@ store_realm(#realm_init{realm = Realm, addr = Addr, port = Port, url = URL, - sysop = #user_data{username = UserName, - realname = RealName, - keys = [KeyName], - contact_info = [ContactInfo]}}) -> + sysop = U = #user_data{username = UserName, + realname = RealName, + contact_info = [ContactInfo]}}) -> ok = make_realm_dirs(Realm), + RealmConfPath = filename:join(zx_lib:path(etc, Realm), "realm.conf"), + ok = file:write_file(RealmConfPath, "Placeholder realm file."), + {ok, KeyHash} = zx_key:generate_rsa({Realm, UserName}), + NewU = U#user_data{keys = [KeyHash]}, RealmConf = [{realm, Realm}, {prime, {Addr, Port}}, {sysop, {UserName, RealName, ContactInfo}}, - {key, KeyName}, + {key, KeyHash}, {url, URL}, {timestamp, calendar:universal_time()}], - RealmConfPath = filename:join(zx_lib:path(etc, Realm), "realm.conf"), ok = zx_lib:write_terms(RealmConfPath, RealmConf), + ok = store_user(NewU), ok = export_realm(Realm), ok = export_user(zpuf, Realm, UserName), ZPUF = Realm ++ "-" ++ UserName ++ ".zpuf", @@ -2064,8 +2067,7 @@ create_sysop(U = #user_data{realname = none}) -> create_sysop(U#user_data{realname = ask_realname()}); create_sysop(U = #user_data{contact_info = none}) -> create_sysop(U#user_data{contact_info = [{"email", ask_email()}]}); -create_sysop(U = #user_data{realm = Realm, - username = UserName, +create_sysop(U = #user_data{username = UserName, realname = RealName, contact_info = [{"email", Email}]}) -> Instructions = @@ -2080,11 +2082,7 @@ create_sysop(U = #user_data{realm = Realm, "1" -> create_sysop(U#user_data{username = none}); "2" -> create_sysop(U#user_data{realname = none}); "3" -> create_sysop(U#user_data{contact_info = none}); - "" -> - {ok, KeyHash} = zx_key:generate_rsa(Realm), - NewU = U#user_data{keys = [KeyHash]}, - ok = store_user(NewU), - NewU; + "" -> U; _ -> ok = zx_tty:derp(), create_sysop(U) diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_net.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_net.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_net.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_net.erl index 084a0c3..a5583b6 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_net.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_net.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_net). --vsn("0.7.2"). +-vsn("0.8.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_peer.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_peer.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_peer.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_peer.erl index 54115db..2843df1 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_peer.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_peer.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_peer). --vsn("0.7.2"). +-vsn("0.8.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_peer_man.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_peer_man.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_peer_man.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_peer_man.erl index 343c7e7..97dda0f 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_peer_man.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_peer_man.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_peer_man). --vsn("0.7.2"). +-vsn("0.8.0"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_peer_sup.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_peer_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_peer_sup.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_peer_sup.erl index b7dcd3f..2475a52 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_peer_sup.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_peer_sup.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_peer_sup). --vsn("0.7.2"). +-vsn("0.8.0"). -behaviour(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_peers.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_peers.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_peers.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_peers.erl index cc550e8..b128aaa 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_peers.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_peers.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_peers). --vsn("0.7.2"). +-vsn("0.8.0"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_proxy.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_proxy.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_proxy.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_proxy.erl index 6c2d229..bfa3684 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_proxy.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_proxy.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_proxy). --vsn("0.7.2"). +-vsn("0.8.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_sup.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_sup.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_sup.erl index f47fd46..9d5db12 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_sup.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_sup). --vsn("0.7.2"). +-vsn("0.8.0"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_tty.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_tty.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_tty.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_tty.erl index c0e5541..9bad42b 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_tty.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_tty.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_tty). --vsn("0.7.2"). +-vsn("0.8.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_userconf.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_userconf.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_userconf.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_userconf.erl index d5df788..06ed2c2 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_userconf.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_userconf.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_userconf). --vsn("0.7.2"). +-vsn("0.8.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.7.2/src/zx_zsp.erl b/zomp/lib/otpr/zx/0.8.0/src/zx_zsp.erl similarity index 99% rename from zomp/lib/otpr/zx/0.7.2/src/zx_zsp.erl rename to zomp/lib/otpr/zx/0.8.0/src/zx_zsp.erl index 8fa2e69..404df2c 100644 --- a/zomp/lib/otpr/zx/0.7.2/src/zx_zsp.erl +++ b/zomp/lib/otpr/zx/0.8.0/src/zx_zsp.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_zsp). --vsn("0.7.2"). +-vsn("0.8.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.7.2/templates/Emakefile b/zomp/lib/otpr/zx/0.8.0/templates/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/Emakefile rename to zomp/lib/otpr/zx/0.8.0/templates/Emakefile diff --git a/zomp/lib/otpr/zx/0.7.2/templates/boringlib/funfile.erl b/zomp/lib/otpr/zx/0.8.0/templates/boringlib/funfile.erl similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/boringlib/funfile.erl rename to zomp/lib/otpr/zx/0.8.0/templates/boringlib/funfile.erl diff --git a/zomp/lib/otpr/zx/0.7.2/templates/escript b/zomp/lib/otpr/zx/0.8.0/templates/escript similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/escript rename to zomp/lib/otpr/zx/0.8.0/templates/escript diff --git a/zomp/lib/otpr/zx/0.7.2/templates/example_server/appmod.erl b/zomp/lib/otpr/zx/0.8.0/templates/example_server/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/example_server/appmod.erl rename to zomp/lib/otpr/zx/0.8.0/templates/example_server/appmod.erl diff --git a/zomp/lib/otpr/zx/0.7.2/templates/example_server/src/client.erl b/zomp/lib/otpr/zx/0.8.0/templates/example_server/src/client.erl similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/example_server/src/client.erl rename to zomp/lib/otpr/zx/0.8.0/templates/example_server/src/client.erl diff --git a/zomp/lib/otpr/zx/0.7.2/templates/example_server/src/client_man.erl b/zomp/lib/otpr/zx/0.8.0/templates/example_server/src/client_man.erl similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/example_server/src/client_man.erl rename to zomp/lib/otpr/zx/0.8.0/templates/example_server/src/client_man.erl diff --git a/zomp/lib/otpr/zx/0.7.2/templates/example_server/src/client_sup.erl b/zomp/lib/otpr/zx/0.8.0/templates/example_server/src/client_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/example_server/src/client_sup.erl rename to zomp/lib/otpr/zx/0.8.0/templates/example_server/src/client_sup.erl diff --git a/zomp/lib/otpr/zx/0.7.2/templates/example_server/src/clients.erl b/zomp/lib/otpr/zx/0.8.0/templates/example_server/src/clients.erl similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/example_server/src/clients.erl rename to zomp/lib/otpr/zx/0.8.0/templates/example_server/src/clients.erl diff --git a/zomp/lib/otpr/zx/0.7.2/templates/example_server/src/sup.erl b/zomp/lib/otpr/zx/0.8.0/templates/example_server/src/sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/example_server/src/sup.erl rename to zomp/lib/otpr/zx/0.8.0/templates/example_server/src/sup.erl diff --git a/zomp/lib/otpr/zx/0.7.2/templates/gitignore b/zomp/lib/otpr/zx/0.8.0/templates/gitignore similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/gitignore rename to zomp/lib/otpr/zx/0.8.0/templates/gitignore diff --git a/zomp/lib/otpr/zx/0.7.2/templates/hellowx/appmod.erl b/zomp/lib/otpr/zx/0.8.0/templates/hellowx/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/hellowx/appmod.erl rename to zomp/lib/otpr/zx/0.8.0/templates/hellowx/appmod.erl diff --git a/zomp/lib/otpr/zx/0.7.2/templates/hellowx/src/con.erl b/zomp/lib/otpr/zx/0.8.0/templates/hellowx/src/con.erl similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/hellowx/src/con.erl rename to zomp/lib/otpr/zx/0.8.0/templates/hellowx/src/con.erl diff --git a/zomp/lib/otpr/zx/0.7.2/templates/hellowx/src/gui.erl b/zomp/lib/otpr/zx/0.8.0/templates/hellowx/src/gui.erl similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/hellowx/src/gui.erl rename to zomp/lib/otpr/zx/0.8.0/templates/hellowx/src/gui.erl diff --git a/zomp/lib/otpr/zx/0.7.2/templates/hellowx/src/sup.erl b/zomp/lib/otpr/zx/0.8.0/templates/hellowx/src/sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/hellowx/src/sup.erl rename to zomp/lib/otpr/zx/0.8.0/templates/hellowx/src/sup.erl diff --git a/zomp/lib/otpr/zx/0.7.2/templates/licenses/apache2.txt b/zomp/lib/otpr/zx/0.8.0/templates/licenses/apache2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/licenses/apache2.txt rename to zomp/lib/otpr/zx/0.8.0/templates/licenses/apache2.txt diff --git a/zomp/lib/otpr/zx/0.7.2/templates/licenses/bsd2.txt b/zomp/lib/otpr/zx/0.8.0/templates/licenses/bsd2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/licenses/bsd2.txt rename to zomp/lib/otpr/zx/0.8.0/templates/licenses/bsd2.txt diff --git a/zomp/lib/otpr/zx/0.7.2/templates/licenses/bsd3.txt b/zomp/lib/otpr/zx/0.8.0/templates/licenses/bsd3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/licenses/bsd3.txt rename to zomp/lib/otpr/zx/0.8.0/templates/licenses/bsd3.txt diff --git a/zomp/lib/otpr/zx/0.7.2/templates/licenses/cc0.txt b/zomp/lib/otpr/zx/0.8.0/templates/licenses/cc0.txt similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/licenses/cc0.txt rename to zomp/lib/otpr/zx/0.8.0/templates/licenses/cc0.txt diff --git a/zomp/lib/otpr/zx/0.7.2/templates/licenses/gpl3.txt b/zomp/lib/otpr/zx/0.8.0/templates/licenses/gpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/licenses/gpl3.txt rename to zomp/lib/otpr/zx/0.8.0/templates/licenses/gpl3.txt diff --git a/zomp/lib/otpr/zx/0.7.2/templates/licenses/lgpl3.txt b/zomp/lib/otpr/zx/0.8.0/templates/licenses/lgpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/licenses/lgpl3.txt rename to zomp/lib/otpr/zx/0.8.0/templates/licenses/lgpl3.txt diff --git a/zomp/lib/otpr/zx/0.7.2/templates/licenses/mit.txt b/zomp/lib/otpr/zx/0.8.0/templates/licenses/mit.txt similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/licenses/mit.txt rename to zomp/lib/otpr/zx/0.8.0/templates/licenses/mit.txt diff --git a/zomp/lib/otpr/zx/0.7.2/templates/licenses/mpl2.txt b/zomp/lib/otpr/zx/0.8.0/templates/licenses/mpl2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/licenses/mpl2.txt rename to zomp/lib/otpr/zx/0.8.0/templates/licenses/mpl2.txt diff --git a/zomp/lib/otpr/zx/0.7.2/templates/simplecli.erl b/zomp/lib/otpr/zx/0.8.0/templates/simplecli.erl similarity index 100% rename from zomp/lib/otpr/zx/0.7.2/templates/simplecli.erl rename to zomp/lib/otpr/zx/0.8.0/templates/simplecli.erl diff --git a/zomp/lib/otpr/zx/0.7.2/zomp.meta b/zomp/lib/otpr/zx/0.8.0/zomp.meta similarity index 91% rename from zomp/lib/otpr/zx/0.7.2/zomp.meta rename to zomp/lib/otpr/zx/0.8.0/zomp.meta index 7d4dc31..5b2e60c 100644 --- a/zomp/lib/otpr/zx/0.7.2/zomp.meta +++ b/zomp/lib/otpr/zx/0.8.0/zomp.meta @@ -9,7 +9,7 @@ {license,"MIT"}. {modules,[]}. {name,"zx"}. -{package_id,{"otpr","zx",{0,7,2}}}. +{package_id,{"otpr","zx",{0,8,0}}}. {prefix,"zx_"}. {repo_url,"https://gitlab.com/zxq9/zx"}. {tags,["tools","package manager","erlang"]}.