diff --git a/zomp/etc/version.txt b/zomp/etc/version.txt index 0d91a54..0f82685 100644 --- a/zomp/etc/version.txt +++ b/zomp/etc/version.txt @@ -1 +1 @@ -0.3.0 +0.3.7 diff --git a/zomp/lib/otpr/zx/0.3.0/Emakefile b/zomp/lib/otpr/zx/0.3.7/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/Emakefile rename to zomp/lib/otpr/zx/0.3.7/Emakefile diff --git a/zomp/lib/otpr/zx/0.3.0/LICENSE b/zomp/lib/otpr/zx/0.3.7/LICENSE similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/LICENSE rename to zomp/lib/otpr/zx/0.3.7/LICENSE diff --git a/zomp/lib/otpr/zx/0.3.0/ebin/zx.app b/zomp/lib/otpr/zx/0.3.7/ebin/zx.app similarity index 92% rename from zomp/lib/otpr/zx/0.3.0/ebin/zx.app rename to zomp/lib/otpr/zx/0.3.7/ebin/zx.app index 1b9b582..b86fcc5 100644 --- a/zomp/lib/otpr/zx/0.3.0/ebin/zx.app +++ b/zomp/lib/otpr/zx/0.3.7/ebin/zx.app @@ -1,6 +1,6 @@ {application,zx, [{description,[]}, - {vsn,"0.3.0"}, + {vsn,"0.3.7"}, {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.3.0/include/zx_logger.hrl b/zomp/lib/otpr/zx/0.3.7/include/zx_logger.hrl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/include/zx_logger.hrl rename to zomp/lib/otpr/zx/0.3.7/include/zx_logger.hrl diff --git a/zomp/lib/otpr/zx/0.3.0/make_zx b/zomp/lib/otpr/zx/0.3.7/make_zx similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/make_zx rename to zomp/lib/otpr/zx/0.3.7/make_zx diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx.erl b/zomp/lib/otpr/zx/0.3.7/src/zx.erl similarity index 99% rename from zomp/lib/otpr/zx/0.3.0/src/zx.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx.erl index 55a8a8e..64b5dbd 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx.erl @@ -24,7 +24,7 @@ %%% @end -module(zx). --vsn("0.3.0"). +-vsn("0.3.7"). -behavior(application). -author("Craig Everett "). -copyright("Craig Everett "). @@ -742,19 +742,20 @@ upgrade() -> {ok, Meta} = zx_lib:read_project_meta(ZxDir), PackageID = {Realm, Name, Current} = maps:get(package_id, Meta), {ok, PackageString} = zx_lib:package_string(PackageID), - ok = tell("Current version: ~s~n", [PackageString]), + ok = tell("Current version: ~s", [PackageString]), {ok, ID} = zx_daemon:latest({Realm, Name}), case zx_daemon:wait_result(ID) of {ok, Current} -> - tell("Running latest version.~n"); + tell("Running latest version."); {ok, Latest} when Latest > Current -> NewID = {Realm, Name, Latest}, ok = acquire([NewID], [NewID]), {ok, LatestString} = zx_lib:version_to_string(Latest), + ok = tell(info, "Acquiring upgrade: ~s", [LatestString]), VersionTxt = filename:join(zx_lib:path(etc), "version.txt"), ok = file:write_file(VersionTxt, LatestString), {ok, NewString} = zx_lib:package_string(NewID), - tell("Upgraded to ~s~n.", [NewString]); + tell("Upgraded to ~s.", [NewString]); {ok, Available} when Available < Current -> {ok, AvailableString} = zx_lib:version_to_string(Available), Message = "Local version is newer than ~s. Nothing to do.~n", diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_auth.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_auth.erl similarity index 99% rename from zomp/lib/otpr/zx/0.3.0/src/zx_auth.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_auth.erl index 10b7fb5..6d5b41e 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_auth.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_auth.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_auth). --vsn("0.3.0"). +-vsn("0.3.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_conn.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_conn.erl similarity index 99% rename from zomp/lib/otpr/zx/0.3.0/src/zx_conn.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_conn.erl index 91b205c..21617fb 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_conn.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_conn.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_conn). --vsn("0.3.0"). +-vsn("0.3.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). @@ -339,7 +339,7 @@ pong(Socket) -> fetch(Socket, ID, PackageID) -> PIDB = term_to_binary(PackageID), - Message = <<0:1, 9:7, PIDB/binary>>, + Message = <<0:1, 12:7, PIDB/binary>>, ok = gen_tcp:send(Socket, Message), case wait_hops(Socket, ID, PIDB) of ok -> diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_conn_sup.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_conn_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.3.0/src/zx_conn_sup.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_conn_sup.erl index ed93147..5cd73a1 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_conn_sup.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_conn_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_conn_sup). --vsn("0.3.0"). +-vsn("0.3.7"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_daemon.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_daemon.erl similarity index 99% rename from zomp/lib/otpr/zx/0.3.0/src/zx_daemon.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_daemon.erl index 1a8a72f..69b3001 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_daemon.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_daemon.erl @@ -138,7 +138,7 @@ %%% @end -module(zx_daemon). --vsn("0.3.0"). +-vsn("0.3.7"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). @@ -1228,7 +1228,9 @@ handle_fetch_result(ID, {done, Bin}, {Requestor, {fetch, R, N, V}}, Requests, MX Result = case do_import_package(Bin) of ok -> - ok = file:write_file(zx_lib:zsp_path({R, N, V}), Bin), + Path = zx_lib:zsp_path({R, N, V}), + ok = filelib:ensure_dir(Path), + ok = file:write_file(Path, Bin), done; Error -> Error diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_key.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_key.erl similarity index 99% rename from zomp/lib/otpr/zx/0.3.0/src/zx_key.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_key.erl index 43a5e59..479790b 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_key.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_key.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_key). --vsn("0.3.0"). +-vsn("0.3.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_lib.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_lib.erl similarity index 99% rename from zomp/lib/otpr/zx/0.3.0/src/zx_lib.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_lib.erl index a6b7183..cf3c22c 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_lib.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_lib.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_lib). --vsn("0.3.0"). +-vsn("0.3.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). @@ -206,7 +206,8 @@ get_prime(Realm) -> -spec read_project_meta() -> Result when Result :: {ok, zx_zsp:meta()} - | {error, file:posix()}. + | {error, file:posix()} + | {error, file:posix(), non_neg_integer()}. %% @private %% @equiv read_meta(".") diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_local.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_local.erl similarity index 99% rename from zomp/lib/otpr/zx/0.3.0/src/zx_local.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_local.erl index 5929725..5d12b6d 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_local.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_local.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_local). --vsn("0.3.0"). +-vsn("0.3.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). @@ -1089,15 +1089,20 @@ version_up(patch, {Realm, Name, OldVersion = {Major, Minor, Patch}}, OldMeta) -> package(TargetDir) -> ok = tell("Packaging ~ts", [TargetDir]), - {ok, Meta} = zx_lib:read_project_meta(TargetDir), + case zx_lib:read_project_meta(TargetDir) of + {ok, Meta} -> package2(TargetDir, Meta); + Error -> Error + end. + +package2(TargetDir, Meta) -> {Realm, _, _} = maps:get(package_id, Meta), UserName = select_user(Realm), case select_private_key({Realm, UserName}) of - {ok, Key} -> package2(TargetDir, Key); + {ok, Key} -> package3(TargetDir, Key); error -> {error, "User has no private keys on the local system.", 1} end. -package2(TargetDir, Key) -> +package3(TargetDir, Key) -> case zx_zsp:pack(TargetDir, Key) of {ok, Path} -> tell("Wrote archive ~ts", [Path]); {error, eexists} -> {error, "Package file already exists. Aborting", 17}; diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_net.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_net.erl similarity index 99% rename from zomp/lib/otpr/zx/0.3.0/src/zx_net.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_net.erl index 7f17a2f..b128df8 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_net.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_net.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_net). --vsn("0.3.0"). +-vsn("0.3.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_peer.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_peer.erl similarity index 86% rename from zomp/lib/otpr/zx/0.3.0/src/zx_peer.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_peer.erl index f297d7a..2de8354 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_peer.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_peer.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_peer). --vsn("0.3.0"). +-vsn("0.3.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). @@ -158,26 +158,30 @@ handle_message(<>) -> 1 -> zx_daemon:subscribe(Payload); 2 -> zx_daemon:unsubscribe(Payload); 3 -> deferred(fun list/1, Payload); - 4 -> deferred(fun zx_daemon:latest/1, Payload); - 5 -> deferred(fun provides/1, Payload); - 6 -> deferred(fun zx_daemon:list_deps/1, Payload); - 7 -> deferred(fun zx_daemon:list_sysops/1, Payload); - 8 -> deferred(fun zx_daemon:fetch/1, Payload); - 9 -> zx_daemon:install(Payload); - 10 -> zx_daemon:build(Payload); - 11 -> zx_daemon:list_mirrors(); - 12 -> zx_daemon:add_mirror(Payload); - 13 -> zx_daemon:drop_mirror(Payload); - 14 -> register_key(Payload); - 15 -> get_key(Payload); - 16 -> keybin(Payload); - 17 -> zx_daemon:find_keypair(Payload); - 18 -> have_key(Payload); - 19 -> list_keys(Payload); - 20 -> zx_daemon:takeover(Payload); - 21 -> zx_daemon:abdicate(Payload); - 22 -> zx_daemon:drop_realm(Payload); - 23 -> deferred(fun zx_daemon:keychain/1, Payload) + 4 -> deferred(fun list/1, Payload); + 5 -> deferred(fun zx_daemon:latest/1, Payload); + 6 -> deferred(fun zx_daemon:describe/1, Payload); + 7 -> deferred(fun zx_daemon:tags/1, Payload); + 8 -> deferred(fun provides/1, Payload); + 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); + 13 -> zx_daemon:keychain(Payload); + 14 -> zx_daemon:install(Payload); + 15 -> zx_daemon:build(Payload); + 16 -> zx_daemon:list_mirrors(); + 17 -> zx_daemon:add_mirror(Payload); + 18 -> zx_daemon:drop_mirror(Payload); + 19 -> register_key(Payload); + 20 -> get_key(Payload); + 21 -> keybin(Payload); + 22 -> zx_daemon:find_keypair(Payload); + 23 -> have_key(Payload); + 24 -> list_keys(Payload); + 25 -> zx_daemon:takeover(Payload); + 26 -> zx_daemon:abdicate(Payload); + 27 -> zx_daemon:drop_realm(Payload) end, pack(Result). diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_peer_man.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_peer_man.erl similarity index 99% rename from zomp/lib/otpr/zx/0.3.0/src/zx_peer_man.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_peer_man.erl index 3b35ff9..638304f 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_peer_man.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_peer_man.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_peer_man). --vsn("0.3.0"). +-vsn("0.3.7"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_peer_sup.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_peer_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.3.0/src/zx_peer_sup.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_peer_sup.erl index 338aebb..4e42096 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_peer_sup.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_peer_sup.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_peer_sup). --vsn("0.3.0"). +-vsn("0.3.7"). -behaviour(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_peers.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_peers.erl similarity index 99% rename from zomp/lib/otpr/zx/0.3.0/src/zx_peers.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_peers.erl index 3dd6298..f3b95c3 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_peers.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_peers.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_peers). --vsn("0.3.0"). +-vsn("0.3.7"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_proxy.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_proxy.erl similarity index 75% rename from zomp/lib/otpr/zx/0.3.0/src/zx_proxy.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_proxy.erl index bd4e682..39f7a20 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_proxy.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_proxy.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_proxy). --vsn("0.3.0"). +-vsn("0.3.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). @@ -137,31 +137,36 @@ loop(Parent, Debug, State = #s{socket = Socket}) -> dispatch(Socket, Action) -> case Action of - {list, R} -> make_query(Socket, 3, R); - {list, R, N} -> make_query(Socket, 3, {R, N}); - {list, R, N, V} -> make_query(Socket, 3, {R, N, V}); - {latest, R, N} -> make_query(Socket, 4, {R, N}); - {latest, R, N, V} -> make_query(Socket, 4, {R, N, V}); - {provides, R, M} -> make_query(Socket, 5, {R, M}); - {list_deps, R, N, V} -> make_query(Socket, 6, {R, N, V}); - {list_sysops, R} -> make_query(Socket, 7, R); + {list, R} -> make_query(Socket, 3, R); + {list, R, N} -> make_query(Socket, 4, {R, N}); + {list, R, N, V} -> make_query(Socket, 4, {R, N, V}); + {latest, R, N} -> make_query(Socket, 5, {R, N}); + {latest, R, N, V} -> make_query(Socket, 5, {R, N, V}); + {describe, R, N} -> make_query(Socket, 6, {R, N}); + {describe, R, N, V} -> make_query(Socket, 6, {R, N, V}); + {tags, R, N} -> make_query(Socket, 7, {R, N}); + {tags, R, N, V} -> make_query(Socket, 7, {R, N, V}); + {provides, R, M} -> make_query(Socket, 8, {R, M}); + {search, R, String} -> make_query(Socket, 9, {R, String}); + {list_deps, R, N, V} -> make_query(Socket, 10, {R, N, V}); + {list_sysops, R} -> make_query(Socket, 11, R); % {fetch, R, N, V} -> fetch(Socket, {R, N, V}); - {fetch, R, N, V} -> make_query(Socket, 8, {R, N, V}); - {install, R, N, V} -> make_query(Socket, 9, {R, N, V}); - {build, R, N, V} -> make_query(Socket, 10, {R, N, V}); - {list_mirrors} -> make_query(Socket, 11, none); - {add_mirror, Host} -> make_query(Socket, 12, Host); - {drop_mirror, Host} -> make_query(Socket, 13, Host); - {register_key, Data} -> make_query(Socket, 14, Data); - {get_key, KeyID} -> make_query(Socket, 15, KeyID); - {keybin, KeyID} -> make_query(Socket, 16, KeyID); - {find_keypair, KeyID} -> make_query(Socket, 17, KeyID); - {have_key, Type, KID} -> make_query(Socket, 18, {Type, KID}); - {list_keys, R} -> make_query(Socket, 19, R); - {takeover, R} -> make_query(Socket, 20, R); - {abdicate, R} -> make_query(Socket, 21, R); - {drop_realm, R} -> make_query(Socket, 22, R); - {keychain, R, K} -> make_query(Socket, 23, {R, K}); + {fetch, R, N, V} -> make_query(Socket, 12, {R, N, V}); + {keychain, R, K} -> make_query(Socket, 13, {R, K}); + {install, R, N, V} -> make_query(Socket, 14, {R, N, V}); + {build, R, N, V} -> make_query(Socket, 15, {R, N, V}); + {list_mirrors} -> make_query(Socket, 16, none); + {add_mirror, Host} -> make_query(Socket, 17, Host); + {drop_mirror, Host} -> make_query(Socket, 18, Host); + {register_key, Data} -> make_query(Socket, 19, Data); + {get_key, KeyID} -> make_query(Socket, 20, KeyID); + {keybin, KeyID} -> make_query(Socket, 21, KeyID); + {find_keypair, KeyID} -> make_query(Socket, 22, KeyID); + {have_key, Type, KID} -> make_query(Socket, 23, {Type, KID}); + {list_keys, R} -> make_query(Socket, 24, R); + {takeover, R} -> make_query(Socket, 25, R); + {abdicate, R} -> make_query(Socket, 26, R); + {drop_realm, R} -> make_query(Socket, 27, R); Unexpected -> Message = "Received unexpected request action. Action: ~200tp", ok = log(warning, Message, [Unexpected]), diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_sup.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.3.0/src/zx_sup.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_sup.erl index 7f311f3..8e2d0d0 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_sup.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_sup). --vsn("0.3.0"). +-vsn("0.3.7"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_tty.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_tty.erl similarity index 99% rename from zomp/lib/otpr/zx/0.3.0/src/zx_tty.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_tty.erl index 72314d4..213efa1 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_tty.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_tty.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_tty). --vsn("0.3.0"). +-vsn("0.3.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_userconf.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_userconf.erl similarity index 99% rename from zomp/lib/otpr/zx/0.3.0/src/zx_userconf.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_userconf.erl index aee95c8..f7307bb 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_userconf.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_userconf.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_userconf). --vsn("0.3.0"). +-vsn("0.3.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.3.0/src/zx_zsp.erl b/zomp/lib/otpr/zx/0.3.7/src/zx_zsp.erl similarity index 98% rename from zomp/lib/otpr/zx/0.3.0/src/zx_zsp.erl rename to zomp/lib/otpr/zx/0.3.7/src/zx_zsp.erl index e1b7438..dbbe307 100644 --- a/zomp/lib/otpr/zx/0.3.0/src/zx_zsp.erl +++ b/zomp/lib/otpr/zx/0.3.7/src/zx_zsp.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_zsp). --vsn("0.3.0"). +-vsn("0.3.7"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). @@ -181,7 +181,11 @@ blithely_extract(ZspBin, lib) -> install(<>, Path) -> ok = filelib:ensure_dir(Path), ok = zx_lib:rm_rf(Path), - ok = file:make_dir(Path), + ok = + case filelib:is_dir(Path) of + true -> ok; + false -> file:make_dir(Path) + end, erl_tar:extract({binary, TarGZ}, [{cwd, Path}, compressed]). diff --git a/zomp/lib/otpr/zx/0.3.0/templates/Emakefile b/zomp/lib/otpr/zx/0.3.7/templates/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/Emakefile rename to zomp/lib/otpr/zx/0.3.7/templates/Emakefile diff --git a/zomp/lib/otpr/zx/0.3.0/templates/boringlib/funfile.erl b/zomp/lib/otpr/zx/0.3.7/templates/boringlib/funfile.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/boringlib/funfile.erl rename to zomp/lib/otpr/zx/0.3.7/templates/boringlib/funfile.erl diff --git a/zomp/lib/otpr/zx/0.3.0/templates/escript b/zomp/lib/otpr/zx/0.3.7/templates/escript similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/escript rename to zomp/lib/otpr/zx/0.3.7/templates/escript diff --git a/zomp/lib/otpr/zx/0.3.0/templates/example_server/appmod.erl b/zomp/lib/otpr/zx/0.3.7/templates/example_server/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/example_server/appmod.erl rename to zomp/lib/otpr/zx/0.3.7/templates/example_server/appmod.erl diff --git a/zomp/lib/otpr/zx/0.3.0/templates/example_server/client.erl b/zomp/lib/otpr/zx/0.3.7/templates/example_server/client.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/example_server/client.erl rename to zomp/lib/otpr/zx/0.3.7/templates/example_server/client.erl diff --git a/zomp/lib/otpr/zx/0.3.0/templates/example_server/client_man.erl b/zomp/lib/otpr/zx/0.3.7/templates/example_server/client_man.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/example_server/client_man.erl rename to zomp/lib/otpr/zx/0.3.7/templates/example_server/client_man.erl diff --git a/zomp/lib/otpr/zx/0.3.0/templates/example_server/client_sup.erl b/zomp/lib/otpr/zx/0.3.7/templates/example_server/client_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/example_server/client_sup.erl rename to zomp/lib/otpr/zx/0.3.7/templates/example_server/client_sup.erl diff --git a/zomp/lib/otpr/zx/0.3.0/templates/example_server/clients.erl b/zomp/lib/otpr/zx/0.3.7/templates/example_server/clients.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/example_server/clients.erl rename to zomp/lib/otpr/zx/0.3.7/templates/example_server/clients.erl diff --git a/zomp/lib/otpr/zx/0.3.0/templates/example_server/src/client.erl b/zomp/lib/otpr/zx/0.3.7/templates/example_server/src/client.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/example_server/src/client.erl rename to zomp/lib/otpr/zx/0.3.7/templates/example_server/src/client.erl diff --git a/zomp/lib/otpr/zx/0.3.0/templates/example_server/src/client_man.erl b/zomp/lib/otpr/zx/0.3.7/templates/example_server/src/client_man.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/example_server/src/client_man.erl rename to zomp/lib/otpr/zx/0.3.7/templates/example_server/src/client_man.erl diff --git a/zomp/lib/otpr/zx/0.3.0/templates/example_server/src/client_sup.erl b/zomp/lib/otpr/zx/0.3.7/templates/example_server/src/client_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/example_server/src/client_sup.erl rename to zomp/lib/otpr/zx/0.3.7/templates/example_server/src/client_sup.erl diff --git a/zomp/lib/otpr/zx/0.3.0/templates/example_server/src/clients.erl b/zomp/lib/otpr/zx/0.3.7/templates/example_server/src/clients.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/example_server/src/clients.erl rename to zomp/lib/otpr/zx/0.3.7/templates/example_server/src/clients.erl diff --git a/zomp/lib/otpr/zx/0.3.0/templates/example_server/src/sup.erl b/zomp/lib/otpr/zx/0.3.7/templates/example_server/src/sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/example_server/src/sup.erl rename to zomp/lib/otpr/zx/0.3.7/templates/example_server/src/sup.erl diff --git a/zomp/lib/otpr/zx/0.3.0/templates/example_server/sup.erl b/zomp/lib/otpr/zx/0.3.7/templates/example_server/sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/example_server/sup.erl rename to zomp/lib/otpr/zx/0.3.7/templates/example_server/sup.erl diff --git a/zomp/lib/otpr/zx/0.3.0/templates/gitignore b/zomp/lib/otpr/zx/0.3.7/templates/gitignore similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/gitignore rename to zomp/lib/otpr/zx/0.3.7/templates/gitignore diff --git a/zomp/lib/otpr/zx/0.3.0/templates/hellowx/appmod.erl b/zomp/lib/otpr/zx/0.3.7/templates/hellowx/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/hellowx/appmod.erl rename to zomp/lib/otpr/zx/0.3.7/templates/hellowx/appmod.erl diff --git a/zomp/lib/otpr/zx/0.3.0/templates/hellowx/src/con.erl b/zomp/lib/otpr/zx/0.3.7/templates/hellowx/src/con.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/hellowx/src/con.erl rename to zomp/lib/otpr/zx/0.3.7/templates/hellowx/src/con.erl diff --git a/zomp/lib/otpr/zx/0.3.0/templates/hellowx/src/gui.erl b/zomp/lib/otpr/zx/0.3.7/templates/hellowx/src/gui.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/hellowx/src/gui.erl rename to zomp/lib/otpr/zx/0.3.7/templates/hellowx/src/gui.erl diff --git a/zomp/lib/otpr/zx/0.3.0/templates/hellowx/src/sup.erl b/zomp/lib/otpr/zx/0.3.7/templates/hellowx/src/sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/hellowx/src/sup.erl rename to zomp/lib/otpr/zx/0.3.7/templates/hellowx/src/sup.erl diff --git a/zomp/lib/otpr/zx/0.3.0/templates/licenses/apache2.txt b/zomp/lib/otpr/zx/0.3.7/templates/licenses/apache2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/licenses/apache2.txt rename to zomp/lib/otpr/zx/0.3.7/templates/licenses/apache2.txt diff --git a/zomp/lib/otpr/zx/0.3.0/templates/licenses/bsd2.txt b/zomp/lib/otpr/zx/0.3.7/templates/licenses/bsd2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/licenses/bsd2.txt rename to zomp/lib/otpr/zx/0.3.7/templates/licenses/bsd2.txt diff --git a/zomp/lib/otpr/zx/0.3.0/templates/licenses/bsd3.txt b/zomp/lib/otpr/zx/0.3.7/templates/licenses/bsd3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/licenses/bsd3.txt rename to zomp/lib/otpr/zx/0.3.7/templates/licenses/bsd3.txt diff --git a/zomp/lib/otpr/zx/0.3.0/templates/licenses/cc0.txt b/zomp/lib/otpr/zx/0.3.7/templates/licenses/cc0.txt similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/licenses/cc0.txt rename to zomp/lib/otpr/zx/0.3.7/templates/licenses/cc0.txt diff --git a/zomp/lib/otpr/zx/0.3.0/templates/licenses/gpl3.txt b/zomp/lib/otpr/zx/0.3.7/templates/licenses/gpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/licenses/gpl3.txt rename to zomp/lib/otpr/zx/0.3.7/templates/licenses/gpl3.txt diff --git a/zomp/lib/otpr/zx/0.3.0/templates/licenses/lgpl3.txt b/zomp/lib/otpr/zx/0.3.7/templates/licenses/lgpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/licenses/lgpl3.txt rename to zomp/lib/otpr/zx/0.3.7/templates/licenses/lgpl3.txt diff --git a/zomp/lib/otpr/zx/0.3.0/templates/licenses/mit.txt b/zomp/lib/otpr/zx/0.3.7/templates/licenses/mit.txt similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/licenses/mit.txt rename to zomp/lib/otpr/zx/0.3.7/templates/licenses/mit.txt diff --git a/zomp/lib/otpr/zx/0.3.0/templates/licenses/mpl2.txt b/zomp/lib/otpr/zx/0.3.7/templates/licenses/mpl2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/licenses/mpl2.txt rename to zomp/lib/otpr/zx/0.3.7/templates/licenses/mpl2.txt diff --git a/zomp/lib/otpr/zx/0.3.0/templates/simplecli.erl b/zomp/lib/otpr/zx/0.3.7/templates/simplecli.erl similarity index 100% rename from zomp/lib/otpr/zx/0.3.0/templates/simplecli.erl rename to zomp/lib/otpr/zx/0.3.7/templates/simplecli.erl diff --git a/zomp/lib/otpr/zx/0.3.0/zomp.meta b/zomp/lib/otpr/zx/0.3.7/zomp.meta similarity index 84% rename from zomp/lib/otpr/zx/0.3.0/zomp.meta rename to zomp/lib/otpr/zx/0.3.7/zomp.meta index 161e4c7..645c27c 100644 --- a/zomp/lib/otpr/zx/0.3.0/zomp.meta +++ b/zomp/lib/otpr/zx/0.3.7/zomp.meta @@ -8,7 +8,7 @@ {license,[]}. {modules,[]}. {name,[]}. -{package_id,{"otpr","zx",{0,3,0}}}. +{package_id,{"otpr","zx",{0,3,7}}}. {prefix,"zx_"}. {repo_url,[]}. {tags,[]}.