From 5069ebe3b8edee7df95e9dd5bd429976be0ddaab Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Thu, 21 Mar 2024 10:54:24 +0900 Subject: [PATCH] Catch IPv4-only failure case A eafnosupport error is returned if IPv4 is not supported at all, but eaddrnotavail can also be returned if the system is not configured to allow listening at 0::1. --- zomp/etc/version.txt | 2 +- zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/Emakefile | 0 zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/LICENSE | 0 .../otpr/zx/{0.13.4 => 0.13.5}/ebin/zx.app | 2 +- .../{0.13.4 => 0.13.5}/include/zx_logger.hrl | 0 .../otpr/zx/{0.13.4 => 0.13.5}/launcher.png | Bin zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/make_zx | 0 .../lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx.erl | 2 +- .../zx/{0.13.4 => 0.13.5}/src/zx_auth.erl | 2 +- .../zx/{0.13.4 => 0.13.5}/src/zx_conn.erl | 2 +- .../zx/{0.13.4 => 0.13.5}/src/zx_conn_sup.erl | 2 +- .../zx/{0.13.4 => 0.13.5}/src/zx_daemon.erl | 2 +- .../otpr/zx/{0.13.4 => 0.13.5}/src/zx_key.erl | 2 +- .../otpr/zx/{0.13.4 => 0.13.5}/src/zx_lib.erl | 2 +- .../zx/{0.13.4 => 0.13.5}/src/zx_local.erl | 2 +- .../otpr/zx/{0.13.4 => 0.13.5}/src/zx_net.erl | 2 +- .../zx/{0.13.4 => 0.13.5}/src/zx_peer.erl | 2 +- .../zx/{0.13.4 => 0.13.5}/src/zx_peer_man.erl | 45 +++++++++--------- .../zx/{0.13.4 => 0.13.5}/src/zx_peer_sup.erl | 2 +- .../zx/{0.13.4 => 0.13.5}/src/zx_peers.erl | 2 +- .../zx/{0.13.4 => 0.13.5}/src/zx_proxy.erl | 2 +- .../otpr/zx/{0.13.4 => 0.13.5}/src/zx_sup.erl | 2 +- .../otpr/zx/{0.13.4 => 0.13.5}/src/zx_tty.erl | 2 +- .../zx/{0.13.4 => 0.13.5}/src/zx_userconf.erl | 2 +- .../otpr/zx/{0.13.4 => 0.13.5}/src/zx_zsp.erl | 2 +- .../zx/{0.13.4 => 0.13.5}/templates/Emakefile | 0 .../templates/boringlib/funfile.erl | 0 .../templates/cowboy_example/appmod.erl | 0 .../templates/cowboy_example/src/_state.erl | 0 .../templates/cowboy_example/src/_sup.erl | 0 .../templates/cowboy_example/src/_top.erl | 0 .../zx/{0.13.4 => 0.13.5}/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.13.4 => 0.13.5}/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/isc.txt | 0 .../templates/licenses/lgpl3.txt | 0 .../templates/licenses/mit.txt | 0 .../templates/licenses/mpl2.txt | 0 .../templates/simplecli.erl | 0 .../templates/swp/worker.erl | 0 .../templates/swp/worker_man.erl | 0 .../templates/swp/worker_sup.erl | 0 .../templates/swp/workers.erl | 0 zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/zomp.meta | 18 +++---- 58 files changed, 51 insertions(+), 50 deletions(-) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/Emakefile (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/LICENSE (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/ebin/zx.app (95%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/include/zx_logger.hrl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/launcher.png (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/make_zx (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx.erl (99%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_auth.erl (99%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_conn.erl (99%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_conn_sup.erl (99%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_daemon.erl (99%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_key.erl (99%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_lib.erl (99%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_local.erl (99%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_net.erl (99%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_peer.erl (99%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_peer_man.erl (92%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_peer_sup.erl (99%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_peers.erl (98%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_proxy.erl (99%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_sup.erl (99%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_tty.erl (99%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_userconf.erl (99%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/src/zx_zsp.erl (99%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/Emakefile (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/boringlib/funfile.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/cowboy_example/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/cowboy_example/src/_state.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/cowboy_example/src/_sup.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/cowboy_example/src/_top.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/escript (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/example_server/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/example_server/src/_client.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/example_server/src/_client_man.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/example_server/src/_client_sup.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/example_server/src/_clients.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/example_server/src/_sup.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/gitignore (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/hellowx/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/hellowx/src/_con.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/hellowx/src/_gui.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/hellowx/src/_sup.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/licenses/apache2.txt (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/licenses/bsd2.txt (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/licenses/bsd3.txt (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/licenses/cc0.txt (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/licenses/gpl3.txt (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/licenses/isc.txt (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/licenses/lgpl3.txt (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/licenses/mit.txt (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/licenses/mpl2.txt (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/simplecli.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/swp/worker.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/swp/worker_man.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/swp/worker_sup.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/templates/swp/workers.erl (100%) rename zomp/lib/otpr/zx/{0.13.4 => 0.13.5}/zomp.meta (91%) diff --git a/zomp/etc/version.txt b/zomp/etc/version.txt index dffa40e..c37136a 100644 --- a/zomp/etc/version.txt +++ b/zomp/etc/version.txt @@ -1 +1 @@ -0.13.4 +0.13.5 diff --git a/zomp/lib/otpr/zx/0.13.4/Emakefile b/zomp/lib/otpr/zx/0.13.5/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/Emakefile rename to zomp/lib/otpr/zx/0.13.5/Emakefile diff --git a/zomp/lib/otpr/zx/0.13.4/LICENSE b/zomp/lib/otpr/zx/0.13.5/LICENSE similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/LICENSE rename to zomp/lib/otpr/zx/0.13.5/LICENSE diff --git a/zomp/lib/otpr/zx/0.13.4/ebin/zx.app b/zomp/lib/otpr/zx/0.13.5/ebin/zx.app similarity index 95% rename from zomp/lib/otpr/zx/0.13.4/ebin/zx.app rename to zomp/lib/otpr/zx/0.13.5/ebin/zx.app index 2dcadaf..7065b88 100644 --- a/zomp/lib/otpr/zx/0.13.4/ebin/zx.app +++ b/zomp/lib/otpr/zx/0.13.5/ebin/zx.app @@ -1,6 +1,6 @@ {application,zx, [{description,"An Erlang development tool and Zomp user client"}, - {vsn,"0.13.4"}, + {vsn,"0.13.5"}, {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.13.4/include/zx_logger.hrl b/zomp/lib/otpr/zx/0.13.5/include/zx_logger.hrl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/include/zx_logger.hrl rename to zomp/lib/otpr/zx/0.13.5/include/zx_logger.hrl diff --git a/zomp/lib/otpr/zx/0.13.4/launcher.png b/zomp/lib/otpr/zx/0.13.5/launcher.png similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/launcher.png rename to zomp/lib/otpr/zx/0.13.5/launcher.png diff --git a/zomp/lib/otpr/zx/0.13.4/make_zx b/zomp/lib/otpr/zx/0.13.5/make_zx similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/make_zx rename to zomp/lib/otpr/zx/0.13.5/make_zx diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx.erl b/zomp/lib/otpr/zx/0.13.5/src/zx.erl similarity index 99% rename from zomp/lib/otpr/zx/0.13.4/src/zx.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx.erl index 45523e2..5f1cc29 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx.erl @@ -24,7 +24,7 @@ %%% @end -module(zx). --vsn("0.13.4"). +-vsn("0.13.5"). -behavior(application). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_auth.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_auth.erl similarity index 99% rename from zomp/lib/otpr/zx/0.13.4/src/zx_auth.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_auth.erl index 26c4955..2b5d4a9 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_auth.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_auth.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_auth). --vsn("0.13.4"). +-vsn("0.13.5"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_conn.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_conn.erl similarity index 99% rename from zomp/lib/otpr/zx/0.13.4/src/zx_conn.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_conn.erl index d1f9d77..cf0c069 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_conn.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_conn.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_conn). --vsn("0.13.4"). +-vsn("0.13.5"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_conn_sup.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_conn_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.13.4/src/zx_conn_sup.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_conn_sup.erl index 95cacbd..e9c89f5 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_conn_sup.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_conn_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_conn_sup). --vsn("0.13.4"). +-vsn("0.13.5"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_daemon.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_daemon.erl similarity index 99% rename from zomp/lib/otpr/zx/0.13.4/src/zx_daemon.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_daemon.erl index 99ebf61..afb508e 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_daemon.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_daemon.erl @@ -138,7 +138,7 @@ %%% @end -module(zx_daemon). --vsn("0.13.4"). +-vsn("0.13.5"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_key.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_key.erl similarity index 99% rename from zomp/lib/otpr/zx/0.13.4/src/zx_key.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_key.erl index 5d69384..990ea39 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_key.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_key.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_key). --vsn("0.13.4"). +-vsn("0.13.5"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_lib.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_lib.erl similarity index 99% rename from zomp/lib/otpr/zx/0.13.4/src/zx_lib.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_lib.erl index 1f0a261..d17b350 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_lib.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_lib.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_lib). --vsn("0.13.4"). +-vsn("0.13.5"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_local.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_local.erl similarity index 99% rename from zomp/lib/otpr/zx/0.13.4/src/zx_local.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_local.erl index 9e40dcb..3301db6 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_local.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_local.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_local). --vsn("0.13.4"). +-vsn("0.13.5"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_net.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_net.erl similarity index 99% rename from zomp/lib/otpr/zx/0.13.4/src/zx_net.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_net.erl index 4f68267..927d9cc 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_net.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_net.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_net). --vsn("0.13.4"). +-vsn("0.13.5"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_peer.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_peer.erl similarity index 99% rename from zomp/lib/otpr/zx/0.13.4/src/zx_peer.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_peer.erl index f1065cf..eba93a5 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_peer.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_peer.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_peer). --vsn("0.13.4"). +-vsn("0.13.5"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_peer_man.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_peer_man.erl similarity index 92% rename from zomp/lib/otpr/zx/0.13.4/src/zx_peer_man.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_peer_man.erl index 6d81f51..03f1648 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_peer_man.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_peer_man.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_peer_man). --vsn("0.13.4"). +-vsn("0.13.5"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). @@ -223,28 +223,11 @@ terminate(_, _) -> %% The "doer" procedure called when a "listen" message is received. do_listen(State = #s{listener = none}) -> - Options = - [inet6, - {ip, {0,0,0,0,0,0,0,1}}, - {active, true}, - {mode, binary}, - {keepalive, true}, - {reuseaddr, true}, - {packet, 4}], {ok, Listener} = - case gen_tcp:listen(0, Options) of - {ok, L} -> - {ok, L}; - {error, eafnosupport} -> - AncientOptions = - [inet, - {ip, {127,0,0,1}}, - {active, true}, - {mode, binary}, - {keepalive, true}, - {reuseaddr, true}, - {packet, 4}], - gen_tcp:listen(0, AncientOptions) + case gen_tcp:listen(0, ipv6_options()) of + {ok, L} -> {ok, L}; + {error, eafnosupport} -> gen_tcp:listen(0, ipv4_options()); + {error, eaddrnotavail} -> gen_tcp:listen(0, ipv4_options()) end, {ok, Port} = inet:port(Listener), {ok, _} = zx_peer:start(Listener), @@ -253,6 +236,24 @@ do_listen(State) -> ok = log(warning, "Already listening."), {error, State}. +ipv6_options() -> + [inet6, + {ip, {0,0,0,0,0,0,0,1}}, + {active, true}, + {mode, binary}, + {keepalive, true}, + {reuseaddr, true}, + {packet, 4}]. + +ipv4_options() -> + [inet, + {ip, {127,0,0,1}}, + {active, true}, + {mode, binary}, + {keepalive, true}, + {reuseaddr, true}, + {packet, 4}]. + -spec do_enroll(Pid, State) -> NewState when Pid :: pid(), diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_peer_sup.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_peer_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.13.4/src/zx_peer_sup.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_peer_sup.erl index bc67ae3..27f255a 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_peer_sup.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_peer_sup.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_peer_sup). --vsn("0.13.4"). +-vsn("0.13.5"). -behaviour(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_peers.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_peers.erl similarity index 98% rename from zomp/lib/otpr/zx/0.13.4/src/zx_peers.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_peers.erl index 78479a4..19bf97b 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_peers.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_peers.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_peers). --vsn("0.13.4"). +-vsn("0.13.5"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_proxy.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_proxy.erl similarity index 99% rename from zomp/lib/otpr/zx/0.13.4/src/zx_proxy.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_proxy.erl index d120d35..d48e426 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_proxy.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_proxy.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_proxy). --vsn("0.13.4"). +-vsn("0.13.5"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_sup.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.13.4/src/zx_sup.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_sup.erl index 48366b0..eb285c5 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_sup.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_sup). --vsn("0.13.4"). +-vsn("0.13.5"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_tty.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_tty.erl similarity index 99% rename from zomp/lib/otpr/zx/0.13.4/src/zx_tty.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_tty.erl index 1f6447c..b319374 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_tty.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_tty.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_tty). --vsn("0.13.4"). +-vsn("0.13.5"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_userconf.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_userconf.erl similarity index 99% rename from zomp/lib/otpr/zx/0.13.4/src/zx_userconf.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_userconf.erl index 70ffdc4..4a37758 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_userconf.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_userconf.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_userconf). --vsn("0.13.4"). +-vsn("0.13.5"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.13.4/src/zx_zsp.erl b/zomp/lib/otpr/zx/0.13.5/src/zx_zsp.erl similarity index 99% rename from zomp/lib/otpr/zx/0.13.4/src/zx_zsp.erl rename to zomp/lib/otpr/zx/0.13.5/src/zx_zsp.erl index e6ef97a..66465fb 100644 --- a/zomp/lib/otpr/zx/0.13.4/src/zx_zsp.erl +++ b/zomp/lib/otpr/zx/0.13.5/src/zx_zsp.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_zsp). --vsn("0.13.4"). +-vsn("0.13.5"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.13.4/templates/Emakefile b/zomp/lib/otpr/zx/0.13.5/templates/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/Emakefile rename to zomp/lib/otpr/zx/0.13.5/templates/Emakefile diff --git a/zomp/lib/otpr/zx/0.13.4/templates/boringlib/funfile.erl b/zomp/lib/otpr/zx/0.13.5/templates/boringlib/funfile.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/boringlib/funfile.erl rename to zomp/lib/otpr/zx/0.13.5/templates/boringlib/funfile.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/cowboy_example/appmod.erl b/zomp/lib/otpr/zx/0.13.5/templates/cowboy_example/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/cowboy_example/appmod.erl rename to zomp/lib/otpr/zx/0.13.5/templates/cowboy_example/appmod.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/cowboy_example/src/_state.erl b/zomp/lib/otpr/zx/0.13.5/templates/cowboy_example/src/_state.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/cowboy_example/src/_state.erl rename to zomp/lib/otpr/zx/0.13.5/templates/cowboy_example/src/_state.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/cowboy_example/src/_sup.erl b/zomp/lib/otpr/zx/0.13.5/templates/cowboy_example/src/_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/cowboy_example/src/_sup.erl rename to zomp/lib/otpr/zx/0.13.5/templates/cowboy_example/src/_sup.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/cowboy_example/src/_top.erl b/zomp/lib/otpr/zx/0.13.5/templates/cowboy_example/src/_top.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/cowboy_example/src/_top.erl rename to zomp/lib/otpr/zx/0.13.5/templates/cowboy_example/src/_top.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/escript b/zomp/lib/otpr/zx/0.13.5/templates/escript similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/escript rename to zomp/lib/otpr/zx/0.13.5/templates/escript diff --git a/zomp/lib/otpr/zx/0.13.4/templates/example_server/appmod.erl b/zomp/lib/otpr/zx/0.13.5/templates/example_server/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/example_server/appmod.erl rename to zomp/lib/otpr/zx/0.13.5/templates/example_server/appmod.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/example_server/src/_client.erl b/zomp/lib/otpr/zx/0.13.5/templates/example_server/src/_client.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/example_server/src/_client.erl rename to zomp/lib/otpr/zx/0.13.5/templates/example_server/src/_client.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/example_server/src/_client_man.erl b/zomp/lib/otpr/zx/0.13.5/templates/example_server/src/_client_man.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/example_server/src/_client_man.erl rename to zomp/lib/otpr/zx/0.13.5/templates/example_server/src/_client_man.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/example_server/src/_client_sup.erl b/zomp/lib/otpr/zx/0.13.5/templates/example_server/src/_client_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/example_server/src/_client_sup.erl rename to zomp/lib/otpr/zx/0.13.5/templates/example_server/src/_client_sup.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/example_server/src/_clients.erl b/zomp/lib/otpr/zx/0.13.5/templates/example_server/src/_clients.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/example_server/src/_clients.erl rename to zomp/lib/otpr/zx/0.13.5/templates/example_server/src/_clients.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/example_server/src/_sup.erl b/zomp/lib/otpr/zx/0.13.5/templates/example_server/src/_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/example_server/src/_sup.erl rename to zomp/lib/otpr/zx/0.13.5/templates/example_server/src/_sup.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/gitignore b/zomp/lib/otpr/zx/0.13.5/templates/gitignore similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/gitignore rename to zomp/lib/otpr/zx/0.13.5/templates/gitignore diff --git a/zomp/lib/otpr/zx/0.13.4/templates/hellowx/appmod.erl b/zomp/lib/otpr/zx/0.13.5/templates/hellowx/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/hellowx/appmod.erl rename to zomp/lib/otpr/zx/0.13.5/templates/hellowx/appmod.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/hellowx/src/_con.erl b/zomp/lib/otpr/zx/0.13.5/templates/hellowx/src/_con.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/hellowx/src/_con.erl rename to zomp/lib/otpr/zx/0.13.5/templates/hellowx/src/_con.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/hellowx/src/_gui.erl b/zomp/lib/otpr/zx/0.13.5/templates/hellowx/src/_gui.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/hellowx/src/_gui.erl rename to zomp/lib/otpr/zx/0.13.5/templates/hellowx/src/_gui.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/hellowx/src/_sup.erl b/zomp/lib/otpr/zx/0.13.5/templates/hellowx/src/_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/hellowx/src/_sup.erl rename to zomp/lib/otpr/zx/0.13.5/templates/hellowx/src/_sup.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/licenses/apache2.txt b/zomp/lib/otpr/zx/0.13.5/templates/licenses/apache2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/licenses/apache2.txt rename to zomp/lib/otpr/zx/0.13.5/templates/licenses/apache2.txt diff --git a/zomp/lib/otpr/zx/0.13.4/templates/licenses/bsd2.txt b/zomp/lib/otpr/zx/0.13.5/templates/licenses/bsd2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/licenses/bsd2.txt rename to zomp/lib/otpr/zx/0.13.5/templates/licenses/bsd2.txt diff --git a/zomp/lib/otpr/zx/0.13.4/templates/licenses/bsd3.txt b/zomp/lib/otpr/zx/0.13.5/templates/licenses/bsd3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/licenses/bsd3.txt rename to zomp/lib/otpr/zx/0.13.5/templates/licenses/bsd3.txt diff --git a/zomp/lib/otpr/zx/0.13.4/templates/licenses/cc0.txt b/zomp/lib/otpr/zx/0.13.5/templates/licenses/cc0.txt similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/licenses/cc0.txt rename to zomp/lib/otpr/zx/0.13.5/templates/licenses/cc0.txt diff --git a/zomp/lib/otpr/zx/0.13.4/templates/licenses/gpl3.txt b/zomp/lib/otpr/zx/0.13.5/templates/licenses/gpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/licenses/gpl3.txt rename to zomp/lib/otpr/zx/0.13.5/templates/licenses/gpl3.txt diff --git a/zomp/lib/otpr/zx/0.13.4/templates/licenses/isc.txt b/zomp/lib/otpr/zx/0.13.5/templates/licenses/isc.txt similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/licenses/isc.txt rename to zomp/lib/otpr/zx/0.13.5/templates/licenses/isc.txt diff --git a/zomp/lib/otpr/zx/0.13.4/templates/licenses/lgpl3.txt b/zomp/lib/otpr/zx/0.13.5/templates/licenses/lgpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/licenses/lgpl3.txt rename to zomp/lib/otpr/zx/0.13.5/templates/licenses/lgpl3.txt diff --git a/zomp/lib/otpr/zx/0.13.4/templates/licenses/mit.txt b/zomp/lib/otpr/zx/0.13.5/templates/licenses/mit.txt similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/licenses/mit.txt rename to zomp/lib/otpr/zx/0.13.5/templates/licenses/mit.txt diff --git a/zomp/lib/otpr/zx/0.13.4/templates/licenses/mpl2.txt b/zomp/lib/otpr/zx/0.13.5/templates/licenses/mpl2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/licenses/mpl2.txt rename to zomp/lib/otpr/zx/0.13.5/templates/licenses/mpl2.txt diff --git a/zomp/lib/otpr/zx/0.13.4/templates/simplecli.erl b/zomp/lib/otpr/zx/0.13.5/templates/simplecli.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/simplecli.erl rename to zomp/lib/otpr/zx/0.13.5/templates/simplecli.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/swp/worker.erl b/zomp/lib/otpr/zx/0.13.5/templates/swp/worker.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/swp/worker.erl rename to zomp/lib/otpr/zx/0.13.5/templates/swp/worker.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/swp/worker_man.erl b/zomp/lib/otpr/zx/0.13.5/templates/swp/worker_man.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/swp/worker_man.erl rename to zomp/lib/otpr/zx/0.13.5/templates/swp/worker_man.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/swp/worker_sup.erl b/zomp/lib/otpr/zx/0.13.5/templates/swp/worker_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/swp/worker_sup.erl rename to zomp/lib/otpr/zx/0.13.5/templates/swp/worker_sup.erl diff --git a/zomp/lib/otpr/zx/0.13.4/templates/swp/workers.erl b/zomp/lib/otpr/zx/0.13.5/templates/swp/workers.erl similarity index 100% rename from zomp/lib/otpr/zx/0.13.4/templates/swp/workers.erl rename to zomp/lib/otpr/zx/0.13.5/templates/swp/workers.erl diff --git a/zomp/lib/otpr/zx/0.13.4/zomp.meta b/zomp/lib/otpr/zx/0.13.5/zomp.meta similarity index 91% rename from zomp/lib/otpr/zx/0.13.4/zomp.meta rename to zomp/lib/otpr/zx/0.13.5/zomp.meta index 455cf63..5512136 100644 --- a/zomp/lib/otpr/zx/0.13.4/zomp.meta +++ b/zomp/lib/otpr/zx/0.13.5/zomp.meta @@ -1,17 +1,17 @@ -{a_email,"zxq9@zxq9.com"}. +{name,"zx"}. +{type,app}. +{modules,[]}. +{prefix,"zx_"}. {author,"Craig Everett"}. +{desc,"An Erlang development tool and Zomp user client"}. +{package_id,{"otpr","zx",{0,13,5}}}. +{deps,[]}. +{key_name,none}. +{a_email,"zxq9@zxq9.com"}. {c_email,"zxq9@zxq9.com"}. {copyright,"Craig Everett"}. -{deps,[]}. -{desc,"An Erlang development tool and Zomp user client"}. {file_exts,[]}. -{key_name,none}. {license,"MIT"}. -{modules,[]}. -{name,"zx"}. -{package_id,{"otpr","zx",{0,13,4}}}. -{prefix,"zx_"}. {repo_url,"https://gitlab.com/zxq9/zx"}. {tags,["tools","package manager","erlang"]}. -{type,app}. {ws_url,"https://zxq9.com/projects/zomp/"}.