Namdak Tonpa 9 years ago
parent
commit
a000fdf1e1
4 changed files with 4 additions and 4 deletions
  1. 1 1
      include/mad.hrl
  2. BIN
      mad
  3. 2 2
      src/provision/mad_repl.erl
  4. 1 1
      src/provision/mad_run.erl

+ 1 - 1
include/mad.hrl

@@ -1 +1 @@
--define(VERSION,"b823f9").
+-define(VERSION,"bccd2c").

BIN
mad


+ 2 - 2
src/provision/mad_repl.erl

@@ -17,7 +17,7 @@ applist() ->
          {ok,Binary} -> parse_applist(Binary); 
          {error,_} ->
            case mad_repl:load_file(Name) of
-              {error,_} -> mad_plan:main([]);
+              {error,_} -> mad_resolve:main([]);
               {ok,Plan} -> parse_applist(Plan) end end.
 
 wildcards(List) -> lists:concat([filelib:wildcard(X)||X<-List]).
@@ -61,7 +61,7 @@ cwd() -> case  file:get_cwd() of {ok, Cwd} -> Cwd; _ -> "." end.
 
 sh(Params) ->
     { _Cwd,_ConfigFileName,_Config } = mad_utils:configs(),
-    mad_plan:main([]),
+    mad_resolve:main([]),
     SystemPath = filelib:wildcard(code:root_dir() ++ "/lib/{"
               ++ string:join([atom_to_list(X)||X<-mad_repl:system()],",") ++ "}-*/ebin"),
     UserPath   = wildcards(["{apps,deps}/*/ebin","ebin"]),

+ 1 - 1
src/provision/mad_run.erl

@@ -2,7 +2,7 @@
 -compile(export_all).
 
 start(App) ->                            % run_dir > < log_dir
-    mad_plan:main([]),
+    mad_resolve:main([]),
     mad:info("Scripting: ~p~n",[escript:script_name()]),
     {_,Status,X} = sh:run("run_erl",["-daemon",".",".","exec "++escript:script_name()++" sh"],
       binary,".",