Maxim Sokhatsky 10 лет назад
Родитель
Сommit
b000e8b907
2 измененных файлов с 13 добавлено и 11 удалено
  1. BIN
      mad
  2. 13 11
      src/mad_repl.erl

+ 13 - 11
src/mad_repl.erl

@@ -7,24 +7,26 @@ load_config() ->
       [] -> skip;
       File ->
             {ok,[Apps]} = file:consult(File),
-            [ begin io:format("~p:~n",[App]),
-              [ begin
-              io:format("\t{~p,~p}~n",[K,V]),
-              application:set_env(App,K,V) end || {K,V} <- Cfg ] end || {App,Cfg} <- Apps]
-             end.
+            io:format("Configuration:\n\r",[]),
+            [ begin 
+                io:format("\t~p: ~p\n\r",[App,Cfg]),
+                [ application:set_env(App,K,V) || {K,V} <- Cfg ]
+            end || {App,Cfg} <- Apps ]
+   end.
 
 load_apps([]) -> [ application:start(A) ||A<-mad_plan:applist()];
 load_apps(["applist"]) -> [ application:start(A) ||A<-mad_plan:applist()];
 load_apps(Params) -> [application:ensure_all_started(list_to_atom(A))||A<-Params].
 
 main(Params) -> 
+    SystemPath = filelib:wildcard(code:root_dir() ++ 
+              "/lib/{compiler,syntax_tools,sasl,tools,mnesia,reltool,xmerl,crypto,kernel,stdlib}-*/ebin"),
+    UserPath = filelib:wildcard("{apps,deps}/*/ebin"),
+    code:set_path(SystemPath++UserPath),
+    io:format("Applications: ~p\n\r",[mad_plan:applist()]),
+    load_config(),
     user_drv:start(),
-    Path = filelib:wildcard(code:root_dir() ++ 
-              "/lib/{compiler,syntax_tools,sasl,tools,mnesia,reltool,xmerl,crypto,kernel,stdlib}-*/ebin") ++
-          filelib:wildcard("{apps,deps}/*/ebin"),
-    code:set_path(Path),
-    error_logger:info_msg("CodePath: ~p~n\r\n",[code:get_path()]),
-    load_config(), load_apps(Params),
+    load_apps(Params),
     case Params of
         ["applist"] -> skip;
         _ ->  timer:sleep(infinity) end.