From 6c1ff3562b0f79859b2edc94ef7f339b04f76ae0 Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Sat, 11 Jan 2020 22:06:11 +0900 Subject: [PATCH] Add desktop integration interface function; implement Linux version --- zomp/etc/version.txt | 2 +- zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/Emakefile | 0 zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/LICENSE | 0 zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/ebin/zx.app | 2 +- .../zx/{0.8.0 => 0.9.0}/include/zx_logger.hrl | 0 zomp/lib/otpr/zx/0.9.0/launcher.png | Bin 0 -> 2109 bytes zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/make_zx | 0 zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx.erl | 140 ++++++++++++++++-- .../otpr/zx/{0.8.0 => 0.9.0}/src/zx_auth.erl | 2 +- .../otpr/zx/{0.8.0 => 0.9.0}/src/zx_conn.erl | 2 +- .../zx/{0.8.0 => 0.9.0}/src/zx_conn_sup.erl | 2 +- .../zx/{0.8.0 => 0.9.0}/src/zx_daemon.erl | 2 +- .../otpr/zx/{0.8.0 => 0.9.0}/src/zx_key.erl | 2 +- .../otpr/zx/{0.8.0 => 0.9.0}/src/zx_lib.erl | 2 +- .../otpr/zx/{0.8.0 => 0.9.0}/src/zx_local.erl | 2 +- .../otpr/zx/{0.8.0 => 0.9.0}/src/zx_net.erl | 2 +- .../otpr/zx/{0.8.0 => 0.9.0}/src/zx_peer.erl | 2 +- .../zx/{0.8.0 => 0.9.0}/src/zx_peer_man.erl | 2 +- .../zx/{0.8.0 => 0.9.0}/src/zx_peer_sup.erl | 2 +- .../otpr/zx/{0.8.0 => 0.9.0}/src/zx_peers.erl | 2 +- .../otpr/zx/{0.8.0 => 0.9.0}/src/zx_proxy.erl | 2 +- .../otpr/zx/{0.8.0 => 0.9.0}/src/zx_sup.erl | 2 +- .../otpr/zx/{0.8.0 => 0.9.0}/src/zx_tty.erl | 2 +- .../zx/{0.8.0 => 0.9.0}/src/zx_userconf.erl | 2 +- .../otpr/zx/{0.8.0 => 0.9.0}/src/zx_zsp.erl | 2 +- .../zx/{0.8.0 => 0.9.0}/templates/Emakefile | 0 .../templates/boringlib/funfile.erl | 0 .../zx/{0.8.0 => 0.9.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.8.0 => 0.9.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.8.0 => 0.9.0}/templates/simplecli.erl | 0 zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/zomp.meta | 2 +- 49 files changed, 150 insertions(+), 30 deletions(-) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/Emakefile (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/LICENSE (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/ebin/zx.app (93%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/include/zx_logger.hrl (100%) create mode 100644 zomp/lib/otpr/zx/0.9.0/launcher.png rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/make_zx (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx.erl (89%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_auth.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_conn.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_conn_sup.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_daemon.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_key.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_lib.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_local.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_net.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_peer.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_peer_man.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_peer_sup.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_peers.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_proxy.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_sup.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_tty.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_userconf.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/src/zx_zsp.erl (99%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/Emakefile (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/boringlib/funfile.erl (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/escript (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/example_server/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/example_server/src/client.erl (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/example_server/src/client_man.erl (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/example_server/src/client_sup.erl (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/example_server/src/clients.erl (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/example_server/src/sup.erl (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/gitignore (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/hellowx/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/hellowx/src/con.erl (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/hellowx/src/gui.erl (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/hellowx/src/sup.erl (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/licenses/apache2.txt (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/licenses/bsd2.txt (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/licenses/bsd3.txt (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/licenses/cc0.txt (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/licenses/gpl3.txt (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/licenses/lgpl3.txt (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/licenses/mit.txt (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/licenses/mpl2.txt (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/templates/simplecli.erl (100%) rename zomp/lib/otpr/zx/{0.8.0 => 0.9.0}/zomp.meta (91%) diff --git a/zomp/etc/version.txt b/zomp/etc/version.txt index a3df0a6..ac39a10 100644 --- a/zomp/etc/version.txt +++ b/zomp/etc/version.txt @@ -1 +1 @@ -0.8.0 +0.9.0 diff --git a/zomp/lib/otpr/zx/0.8.0/Emakefile b/zomp/lib/otpr/zx/0.9.0/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/Emakefile rename to zomp/lib/otpr/zx/0.9.0/Emakefile diff --git a/zomp/lib/otpr/zx/0.8.0/LICENSE b/zomp/lib/otpr/zx/0.9.0/LICENSE similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/LICENSE rename to zomp/lib/otpr/zx/0.9.0/LICENSE diff --git a/zomp/lib/otpr/zx/0.8.0/ebin/zx.app b/zomp/lib/otpr/zx/0.9.0/ebin/zx.app similarity index 93% rename from zomp/lib/otpr/zx/0.8.0/ebin/zx.app rename to zomp/lib/otpr/zx/0.9.0/ebin/zx.app index 7fe263e..41a0367 100644 --- a/zomp/lib/otpr/zx/0.8.0/ebin/zx.app +++ b/zomp/lib/otpr/zx/0.9.0/ebin/zx.app @@ -1,6 +1,6 @@ {application,zx, [{description,"An Erlang development tool and Zomp user client"}, - {vsn,"0.8.0"}, + {vsn,"0.9.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.8.0/include/zx_logger.hrl b/zomp/lib/otpr/zx/0.9.0/include/zx_logger.hrl similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/include/zx_logger.hrl rename to zomp/lib/otpr/zx/0.9.0/include/zx_logger.hrl diff --git a/zomp/lib/otpr/zx/0.9.0/launcher.png b/zomp/lib/otpr/zx/0.9.0/launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..987a618e2403af895bfaf8c2f929e3a4f3746659 GIT binary patch literal 2109 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 literal 0 HcmV?d00001 diff --git a/zomp/lib/otpr/zx/0.8.0/make_zx b/zomp/lib/otpr/zx/0.9.0/make_zx similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/make_zx rename to zomp/lib/otpr/zx/0.9.0/make_zx diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx.erl b/zomp/lib/otpr/zx/0.9.0/src/zx.erl similarity index 89% rename from zomp/lib/otpr/zx/0.8.0/src/zx.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx.erl index 15db14c..e4c88cb 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx.erl @@ -24,7 +24,7 @@ %%% @end -module(zx). --vsn("0.8.0"). +-vsn("0.9.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/1, describe/1, describe_plural/1, + list_type/2, list_type_ar/1, describe/1, describe_plural/1, integrate/1, stop/0, silent_stop/0]). -export([start/2, stop/1]). @@ -63,7 +63,7 @@ Minor :: non_neg_integer() | z, Patch :: non_neg_integer() | z}. -type host() :: {string() | inet:ip_address(), inet:port_number()}. --type key() :: term(). % Srsly. This is what public_key:der_decode/2 returns. +-type key() :: term(). % wtf? This is what public_key:der_decode/2 returns -type key_data() :: {Name :: key_name(), Public :: none | key_bin(), Private :: none | key_bin()}. @@ -133,7 +133,7 @@ do(["run", PackageString | ArgV]) -> not_done(run(PackageString, ArgV)); do(["integrate", "desktop", PackageString]) -> ok = zx_daemon:connect(), - done(zx_local:integrate(PackageString)); + done(integrate0(PackageString)); do(["list", "realms"]) -> done(zx_local:list_realms()); do(["list", "packages", Realm]) -> @@ -669,6 +669,126 @@ describe_plural(PackageIDs) -> {ok, [Description || {_, {ok, Description}} <- Descriptions]}. +-spec integrate(PackageString) -> zx:outcome() + when PackageString :: string(). + +integrate0(PackageString) -> + case zx_lib:package_id(PackageString) of + {ok, PackageID} -> integrate(PackageID); + Error -> Error + end. + + +integrate(PackageID) -> + case resolve_version(PackageID) of + {fetch, FetchID} -> integrate2(PackageID, FetchID); + {installed, InstalledID} -> integrate3(PackageID, InstalledID); + Error -> Error + end. + + +integrate2(PackageID, FetchID) -> + case fetch(FetchID) of + ok -> integrate3(PackageID, FetchID); + Error -> Error + end. + + +integrate3(PackageID, InstalledID) -> + Dir = zx_lib:ppath(lib, InstalledID), + {ok, Meta} = zx_lib:read_project_meta(Dir), + case maps:get(type, Meta) of + gui -> integrate4(PackageID, InstalledID, Meta); + Type -> {error, {bad_app_type, Type}} + end. + +integrate4(PackageID, InstalledID, Meta) -> + case os:type() of + {unix, linux} -> + integrate_linux(PackageID, InstalledID, Meta); +% {win32, nt} -> + Other -> + Message = "Sorry! This command is not yet supported on ~p.", + ok = tell(error, Message, [Other]), + {error, "Feature unsupported on this platform."} + end. + + +integrate_linux(PackageID, InstalledID, Meta) -> + XDG_DESKTOP_DIR = discover_xdg_desktop(), + case filelib:is_dir(XDG_DESKTOP_DIR) of + true -> integrate_linux(PackageID, InstalledID, Meta, XDG_DESKTOP_DIR); + false -> {error, "No desktop directory defined by XDG."} + end. + +integrate_linux(PackageID, InstalledID, Meta, XDG_DESKTOP_DIR) -> + IconPath = place_icon(InstalledID), + Name = element(2, InstalledID), + Title = + case maps:get(name, Meta) of + "" -> Name; + N -> N + end, + {ok, PackageString} = zx_lib:package_string(PackageID), + Version = element(3, PackageID), + {ok, VersionString} = zx_lib:version_to_string(Version), + Exec = "zx run " ++ PackageString, + Launcher = filename:join(XDG_DESKTOP_DIR, Name ++ ".desktop"), + Entry = + ["[Desktop Entry]\n", + "Encoding=UTF-8\n", + "Version=", VersionString, "\n", + "Exec=", Exec, "\n", + "Name=", Title, "\n", + "Comment=", Title, "\n", + "Type=Application\n", + "Terminal=false\n", + "Icon=", IconPath, "\n"], + ok = file:write_file(Launcher, unicode:characters_to_list(Entry)), + _ = os:cmd("chmod +x " ++ Launcher), + ok. + + +place_icon({Realm, Name, Version}) -> + InstallDir = zx_lib:path(lib, Realm, Name, Version), + VarDir = zx_lib:path(var, Realm, Name), + Icon = "launcher.png", + IconSource = filename:join(InstallDir, Icon), + IconPath = filename:join(VarDir, Icon), + {ok, _} = + case filelib:is_regular(IconSource) of + true -> + file:copy(IconSource, IconPath); + false -> + ZxVersionS = os:getenv("ZX_VERSION"), + {ok, ZxVersion} = zx_lib:string_to_version(ZxVersionS), + ZxDir = zx_lib:path(lib, "otpr", "zx", ZxVersion), + ZxIconPath = filename:join(ZxDir, Icon), + ok = filelib:ensure_dir(IconPath), + file:copy(ZxIconPath, IconPath) + end, + IconPath. + +discover_xdg_desktop() -> + XDG_UserDirsConf = + case os:getenv("XDG_CONFIG_HOME") of + false -> filename:join(os:getenv("HOME"), ".config/user-dirs.dirs"); + "" -> filename:join(os:getenv("HOME"), ".config/user-dirs.dirs"); + D -> filename:join(D, "user-dirs.dirs") + end, + {ok, Bits} = file:read_file(XDG_UserDirsConf), + Segments = string:split(unicode:characters_to_list(Bits), "\n", all), + search_xdg(Segments). + +search_xdg(["XDG_DESKTOP_DIR=" ++ Value | _]) -> + filename:join(os:getenv("HOME"), filename:basename(string:trim(Value, both, "\""))); +search_xdg([_ | Rest]) -> + search_xdg(Rest); +search_xdg([]) -> + filename:join(os:getenv("HOME"), "Desktop"). + + + %%% Execution of application -spec run(PackageString, RunArgs) -> zx:outcome() @@ -723,20 +843,20 @@ tuplize(String, Acc) -> run2(FuzzyID, RunArgs) -> case resolve_version(FuzzyID) of - {installed, PackageID} -> run3(PackageID, RunArgs); - {fetch, PackageID} -> run3_maybe(PackageID, RunArgs); + {fetch, PackageID} -> run3(PackageID, RunArgs); + {installed, PackageID} -> run4(PackageID, RunArgs); Error -> Error end. -run3_maybe(PackageID, RunArgs) -> +run3(PackageID, RunArgs) -> case fetch(PackageID) of - ok -> run3(PackageID, RunArgs); + ok -> run4(PackageID, RunArgs); Error -> Error end. -run3(PackageID, RunArgs) -> +run4(PackageID, RunArgs) -> Dir = zx_lib:ppath(lib, PackageID), {ok, Meta} = zx_lib:read_project_meta(Dir), Type = maps:get(type, Meta), @@ -999,7 +1119,7 @@ usage_user() -> " zx import realm RealmFile~n" " zx drop realm Realm~n" " zx add mirror [Address [Port]]~n" - " zx drop mirror [Address [Port]]~n~n" + " zx drop mirror [Address [Port]]~n" " zx --version~n~n". usage_dev() -> diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_auth.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_auth.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_auth.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_auth.erl index 2a0e9e3..e8e3f85 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_auth.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_auth.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_auth). --vsn("0.8.0"). +-vsn("0.9.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_conn.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_conn.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_conn.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_conn.erl index ecfa086..4dc3594 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_conn.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_conn.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_conn). --vsn("0.8.0"). +-vsn("0.9.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_conn_sup.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_conn_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_conn_sup.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_conn_sup.erl index e4e0ef9..ecebeb3 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_conn_sup.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_conn_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_conn_sup). --vsn("0.8.0"). +-vsn("0.9.0"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_daemon.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_daemon.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_daemon.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_daemon.erl index 091dcf5..5e58b4b 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_daemon.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_daemon.erl @@ -138,7 +138,7 @@ %%% @end -module(zx_daemon). --vsn("0.8.0"). +-vsn("0.9.0"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_key.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_key.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_key.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_key.erl index 581f9c2..725cb30 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_key.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_key.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_key). --vsn("0.8.0"). +-vsn("0.9.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_lib.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_lib.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_lib.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_lib.erl index 468a703..7528aef 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_lib.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_lib.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_lib). --vsn("0.8.0"). +-vsn("0.9.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_local.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_local.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_local.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_local.erl index aafffc6..bcd5925 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_local.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_local.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_local). --vsn("0.8.0"). +-vsn("0.9.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_net.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_net.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_net.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_net.erl index a5583b6..d45bf0d 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_net.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_net.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_net). --vsn("0.8.0"). +-vsn("0.9.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_peer.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_peer.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_peer.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_peer.erl index 2843df1..de15245 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_peer.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_peer.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_peer). --vsn("0.8.0"). +-vsn("0.9.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_peer_man.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_peer_man.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_peer_man.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_peer_man.erl index 97dda0f..fd1908b 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_peer_man.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_peer_man.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_peer_man). --vsn("0.8.0"). +-vsn("0.9.0"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_peer_sup.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_peer_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_peer_sup.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_peer_sup.erl index 2475a52..e6a03d7 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_peer_sup.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_peer_sup.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_peer_sup). --vsn("0.8.0"). +-vsn("0.9.0"). -behaviour(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_peers.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_peers.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_peers.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_peers.erl index b128aaa..5d12253 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_peers.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_peers.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_peers). --vsn("0.8.0"). +-vsn("0.9.0"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_proxy.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_proxy.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_proxy.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_proxy.erl index bfa3684..70538a9 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_proxy.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_proxy.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_proxy). --vsn("0.8.0"). +-vsn("0.9.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_sup.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_sup.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_sup.erl index 9d5db12..ef685ac 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_sup.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_sup). --vsn("0.8.0"). +-vsn("0.9.0"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_tty.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_tty.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_tty.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_tty.erl index 9bad42b..badbfc3 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_tty.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_tty.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_tty). --vsn("0.8.0"). +-vsn("0.9.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_userconf.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_userconf.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_userconf.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_userconf.erl index 06ed2c2..3982367 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_userconf.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_userconf.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_userconf). --vsn("0.8.0"). +-vsn("0.9.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.8.0/src/zx_zsp.erl b/zomp/lib/otpr/zx/0.9.0/src/zx_zsp.erl similarity index 99% rename from zomp/lib/otpr/zx/0.8.0/src/zx_zsp.erl rename to zomp/lib/otpr/zx/0.9.0/src/zx_zsp.erl index 404df2c..19b743a 100644 --- a/zomp/lib/otpr/zx/0.8.0/src/zx_zsp.erl +++ b/zomp/lib/otpr/zx/0.9.0/src/zx_zsp.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_zsp). --vsn("0.8.0"). +-vsn("0.9.0"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.8.0/templates/Emakefile b/zomp/lib/otpr/zx/0.9.0/templates/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/Emakefile rename to zomp/lib/otpr/zx/0.9.0/templates/Emakefile diff --git a/zomp/lib/otpr/zx/0.8.0/templates/boringlib/funfile.erl b/zomp/lib/otpr/zx/0.9.0/templates/boringlib/funfile.erl similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/boringlib/funfile.erl rename to zomp/lib/otpr/zx/0.9.0/templates/boringlib/funfile.erl diff --git a/zomp/lib/otpr/zx/0.8.0/templates/escript b/zomp/lib/otpr/zx/0.9.0/templates/escript similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/escript rename to zomp/lib/otpr/zx/0.9.0/templates/escript diff --git a/zomp/lib/otpr/zx/0.8.0/templates/example_server/appmod.erl b/zomp/lib/otpr/zx/0.9.0/templates/example_server/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/example_server/appmod.erl rename to zomp/lib/otpr/zx/0.9.0/templates/example_server/appmod.erl diff --git a/zomp/lib/otpr/zx/0.8.0/templates/example_server/src/client.erl b/zomp/lib/otpr/zx/0.9.0/templates/example_server/src/client.erl similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/example_server/src/client.erl rename to zomp/lib/otpr/zx/0.9.0/templates/example_server/src/client.erl diff --git a/zomp/lib/otpr/zx/0.8.0/templates/example_server/src/client_man.erl b/zomp/lib/otpr/zx/0.9.0/templates/example_server/src/client_man.erl similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/example_server/src/client_man.erl rename to zomp/lib/otpr/zx/0.9.0/templates/example_server/src/client_man.erl diff --git a/zomp/lib/otpr/zx/0.8.0/templates/example_server/src/client_sup.erl b/zomp/lib/otpr/zx/0.9.0/templates/example_server/src/client_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/example_server/src/client_sup.erl rename to zomp/lib/otpr/zx/0.9.0/templates/example_server/src/client_sup.erl diff --git a/zomp/lib/otpr/zx/0.8.0/templates/example_server/src/clients.erl b/zomp/lib/otpr/zx/0.9.0/templates/example_server/src/clients.erl similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/example_server/src/clients.erl rename to zomp/lib/otpr/zx/0.9.0/templates/example_server/src/clients.erl diff --git a/zomp/lib/otpr/zx/0.8.0/templates/example_server/src/sup.erl b/zomp/lib/otpr/zx/0.9.0/templates/example_server/src/sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/example_server/src/sup.erl rename to zomp/lib/otpr/zx/0.9.0/templates/example_server/src/sup.erl diff --git a/zomp/lib/otpr/zx/0.8.0/templates/gitignore b/zomp/lib/otpr/zx/0.9.0/templates/gitignore similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/gitignore rename to zomp/lib/otpr/zx/0.9.0/templates/gitignore diff --git a/zomp/lib/otpr/zx/0.8.0/templates/hellowx/appmod.erl b/zomp/lib/otpr/zx/0.9.0/templates/hellowx/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/hellowx/appmod.erl rename to zomp/lib/otpr/zx/0.9.0/templates/hellowx/appmod.erl diff --git a/zomp/lib/otpr/zx/0.8.0/templates/hellowx/src/con.erl b/zomp/lib/otpr/zx/0.9.0/templates/hellowx/src/con.erl similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/hellowx/src/con.erl rename to zomp/lib/otpr/zx/0.9.0/templates/hellowx/src/con.erl diff --git a/zomp/lib/otpr/zx/0.8.0/templates/hellowx/src/gui.erl b/zomp/lib/otpr/zx/0.9.0/templates/hellowx/src/gui.erl similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/hellowx/src/gui.erl rename to zomp/lib/otpr/zx/0.9.0/templates/hellowx/src/gui.erl diff --git a/zomp/lib/otpr/zx/0.8.0/templates/hellowx/src/sup.erl b/zomp/lib/otpr/zx/0.9.0/templates/hellowx/src/sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/hellowx/src/sup.erl rename to zomp/lib/otpr/zx/0.9.0/templates/hellowx/src/sup.erl diff --git a/zomp/lib/otpr/zx/0.8.0/templates/licenses/apache2.txt b/zomp/lib/otpr/zx/0.9.0/templates/licenses/apache2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/licenses/apache2.txt rename to zomp/lib/otpr/zx/0.9.0/templates/licenses/apache2.txt diff --git a/zomp/lib/otpr/zx/0.8.0/templates/licenses/bsd2.txt b/zomp/lib/otpr/zx/0.9.0/templates/licenses/bsd2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/licenses/bsd2.txt rename to zomp/lib/otpr/zx/0.9.0/templates/licenses/bsd2.txt diff --git a/zomp/lib/otpr/zx/0.8.0/templates/licenses/bsd3.txt b/zomp/lib/otpr/zx/0.9.0/templates/licenses/bsd3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/licenses/bsd3.txt rename to zomp/lib/otpr/zx/0.9.0/templates/licenses/bsd3.txt diff --git a/zomp/lib/otpr/zx/0.8.0/templates/licenses/cc0.txt b/zomp/lib/otpr/zx/0.9.0/templates/licenses/cc0.txt similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/licenses/cc0.txt rename to zomp/lib/otpr/zx/0.9.0/templates/licenses/cc0.txt diff --git a/zomp/lib/otpr/zx/0.8.0/templates/licenses/gpl3.txt b/zomp/lib/otpr/zx/0.9.0/templates/licenses/gpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/licenses/gpl3.txt rename to zomp/lib/otpr/zx/0.9.0/templates/licenses/gpl3.txt diff --git a/zomp/lib/otpr/zx/0.8.0/templates/licenses/lgpl3.txt b/zomp/lib/otpr/zx/0.9.0/templates/licenses/lgpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/licenses/lgpl3.txt rename to zomp/lib/otpr/zx/0.9.0/templates/licenses/lgpl3.txt diff --git a/zomp/lib/otpr/zx/0.8.0/templates/licenses/mit.txt b/zomp/lib/otpr/zx/0.9.0/templates/licenses/mit.txt similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/licenses/mit.txt rename to zomp/lib/otpr/zx/0.9.0/templates/licenses/mit.txt diff --git a/zomp/lib/otpr/zx/0.8.0/templates/licenses/mpl2.txt b/zomp/lib/otpr/zx/0.9.0/templates/licenses/mpl2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/licenses/mpl2.txt rename to zomp/lib/otpr/zx/0.9.0/templates/licenses/mpl2.txt diff --git a/zomp/lib/otpr/zx/0.8.0/templates/simplecli.erl b/zomp/lib/otpr/zx/0.9.0/templates/simplecli.erl similarity index 100% rename from zomp/lib/otpr/zx/0.8.0/templates/simplecli.erl rename to zomp/lib/otpr/zx/0.9.0/templates/simplecli.erl diff --git a/zomp/lib/otpr/zx/0.8.0/zomp.meta b/zomp/lib/otpr/zx/0.9.0/zomp.meta similarity index 91% rename from zomp/lib/otpr/zx/0.8.0/zomp.meta rename to zomp/lib/otpr/zx/0.9.0/zomp.meta index 5b2e60c..33d8eb2 100644 --- a/zomp/lib/otpr/zx/0.8.0/zomp.meta +++ b/zomp/lib/otpr/zx/0.9.0/zomp.meta @@ -9,7 +9,7 @@ {license,"MIT"}. {modules,[]}. {name,"zx"}. -{package_id,{"otpr","zx",{0,8,0}}}. +{package_id,{"otpr","zx",{0,9,0}}}. {prefix,"zx_"}. {repo_url,"https://gitlab.com/zxq9/zx"}. {tags,["tools","package manager","erlang"]}.