Fixes

- Project creation/init continuation corrected
- Remove OS call to grep

zomp/etc/version.txt

@@ -1 +1 @@
-0.11.2
+0.11.3

zomp/lib/otpr/zx/0.11.3/ebin/zx.app

@@ -1,9 +1,11 @@
 {application,zx,
              [{description,"An Erlang development tool and Zomp user client"},
-              {vsn,"0.11.2"},
+              {vsn,"0.11.3"},
               {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,
                         zx_peer_sup,zx_peers,zx_proxy,zx_sup,zx_tty,
-                        zx_userconf,zx_zsp]},
+                        zx_userconf,zx_zsp,funfile,appmod,'_client',
+                        '_client_man','_client_sup','_clients','_sup',appmod,
+                        '_con','_gui','_sup',simplecli]},
               {mod,{zx,none}}]}.

zomp/lib/otpr/zx/0.11.3/src/zx.erl

@@ -24,7 +24,7 @@
 %%% @end
 
 -module(zx).
--vsn("0.11.2").
+-vsn("0.11.3").
 -behavior(application).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.11.3/src/zx_auth.erl

@@ -9,7 +9,7 @@
 %%% @end
 
 -module(zx_auth).
--vsn("0.11.2").
+-vsn("0.11.3").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.11.3/src/zx_conn.erl

@@ -7,7 +7,7 @@
 %%% @end
 
 -module(zx_conn).
--vsn("0.11.2").
+-vsn("0.11.3").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.11.3/src/zx_conn_sup.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_conn_sup).
--vsn("0.11.2").
+-vsn("0.11.3").
 -behavior(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.11.3/src/zx_daemon.erl

@@ -138,7 +138,7 @@
 %%% @end
 
 -module(zx_daemon).
--vsn("0.11.2").
+-vsn("0.11.3").
 -behavior(gen_server).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.11.3/src/zx_key.erl

@@ -8,7 +8,7 @@
 %%% @end
 
 -module(zx_key).
--vsn("0.11.2").
+-vsn("0.11.3").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.11.3/src/zx_lib.erl

@@ -10,7 +10,7 @@
 %%% @end
 
 -module(zx_lib).
--vsn("0.11.2").
+-vsn("0.11.3").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.11.3/src/zx_local.erl

@@ -6,7 +6,7 @@
 %%% @end
 
 -module(zx_local).
--vsn("0.11.2").
+-vsn("0.11.3").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").
@@ -239,7 +239,7 @@ initialize(P = #project{type      = Type,
 project_check(P = #project{id = PackageID}, Continue, Retry) ->
     case package_exists(PackageID) of
         false ->
-            zompify(P);
+            Continue(P);
         true ->
             Message =
                 "~nDHOH!~n"
@@ -432,8 +432,7 @@ initialize_app_file({_, Name, Version}, AppMod, Type, Desc) ->
                   {included_applications, []},
                   {applications,          [stdlib, kernel]}]}
         end,
-    Grep = "grep -roP '^-module\\(\\K[^)]+' src/* | cut -d: -f2",
+    Modules = list_modules(),
-    Modules = [list_to_atom(M) || M <- string:lexemes(os:cmd(Grep), "\n")],
     Properties =
         case (Type == cli) or (Type == lib) of
             true ->
@@ -451,6 +450,15 @@ initialize_app_file({_, Name, Version}, AppMod, Type, Desc) ->
     zx_lib:write_terms(AppFile, [AppProfile]).
 
 
+list_modules() -> list_modules(".").
+
+
+-spec list_modules(BaseDir :: file:filename()) -> [module()].
+
+list_modules(Dir) ->
+    Target = filename:join(Dir, "**/*.erl"),
+    [list_to_atom(filename:basename(F, ".erl")) || F <- filelib:wildcard(Target)].
+
 -spec update_meta() -> zx:outcome().
 
 update_meta() ->
@@ -641,8 +649,7 @@ update_app_file(Meta) ->
                   {included_applications, []},
                   {applications,          [stdlib, kernel]}]}
         end,
-    Grep = "grep -roP '^-module\\(\\K[^)]+' src/* | cut -d: -f2",
+    Modules = list_modules(),
-    Modules = [list_to_atom(M) || M <- string:lexemes(os:cmd(Grep), "\n")],
     Properties = [{description, Desc}, {vsn, VersionString}, {modules, Modules}],
     Store = fun(T, L) -> lists:keystore(element(1, T), 1, L, T) end,
     AppData = lists:foldl(Store, RawAppData, Properties),

zomp/lib/otpr/zx/0.11.3/src/zx_net.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_net).
--vsn("0.11.2").
+-vsn("0.11.3").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.11.3/src/zx_peer.erl

@@ -8,7 +8,7 @@
 %%% @end
 
 -module(zx_peer).
--vsn("0.11.2").
+-vsn("0.11.3").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.11.3/src/zx_peer_man.erl

@@ -9,7 +9,7 @@
 %%% @end
 
 -module(zx_peer_man).
--vsn("0.11.2").
+-vsn("0.11.3").
 -behavior(gen_server).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.11.3/src/zx_peer_sup.erl

@@ -6,7 +6,7 @@
 %%% @end
 
 -module(zx_peer_sup).
--vsn("0.11.2").
+-vsn("0.11.3").
 -behaviour(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.11.3/src/zx_peers.erl

@@ -10,7 +10,7 @@
 %%% @end
 
 -module(zx_peers).
--vsn("0.11.2").
+-vsn("0.11.3").
 -behavior(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.11.3/src/zx_proxy.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_proxy).
--vsn("0.11.2").
+-vsn("0.11.3").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.11.3/src/zx_sup.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_sup).
--vsn("0.11.2").
+-vsn("0.11.3").
 -behavior(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.11.3/src/zx_tty.erl

@@ -6,7 +6,7 @@
 %%% @end
 
 -module(zx_tty).
--vsn("0.11.2").
+-vsn("0.11.3").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.11.3/src/zx_userconf.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_userconf).
--vsn("0.11.2").
+-vsn("0.11.3").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.11.3/src/zx_zsp.erl

@@ -7,7 +7,7 @@
 %%% @end
 
 -module(zx_zsp).
--vsn("0.11.2").
+-vsn("0.11.3").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.11.3/zomp.meta

@@ -9,7 +9,7 @@
 {license,"MIT"}.
 {modules,[]}.
 {name,"zx"}.
-{package_id,{"otpr","zx",{0,11,2}}}.
+{package_id,{"otpr","zx",{0,11,3}}}.
 {prefix,"zx_"}.
 {repo_url,"https://gitlab.com/zxq9/zx"}.
 {tags,["tools","package manager","erlang"]}.