Просмотр исходного кода

Merge branch 'master' of github.com:synrc/mad

Namdak Tonpa 10 лет назад
Родитель
Сommit
7d56794f9b
3 измененных файлов с 5 добавлено и 5 удалено
  1. 1 1
      priv/web/rebar.config
  2. 1 1
      src/mad.erl
  3. 3 3
      src/mad_repl.erl

+ 1 - 1
priv/web/rebar.config

@@ -2,7 +2,7 @@
 {deps_dir,"deps"}.
 {deps_dir,"deps"}.
 {deps, [
 {deps, [
     {erlydtl,".*", {git, "git://github.com/evanmiller/erlydtl", {tag, "0.8.0"} }},
     {erlydtl,".*", {git, "git://github.com/evanmiller/erlydtl", {tag, "0.8.0"} }},
-    {cowboy, ".*", {git, "git://github.com/extend/cowboy",      {tag, "0.9.0"} }},
+    {cowboy, ".*", {git, "git://github.com/extend/cowboy",      {tag, "1.0.1"} }},
     {gproc,  ".*", {git, "git://github.com/uwiger/gproc.git",   {tag, "0.3"}   }},
     {gproc,  ".*", {git, "git://github.com/uwiger/gproc.git",   {tag, "0.3"}   }},
     {mad,    ".*", {git, "git://github.com/synrc/mad",          {tag, "master"}   }},
     {mad,    ".*", {git, "git://github.com/synrc/mad",          {tag, "master"}   }},
     {fs,     ".*", {git, "git://github.com/synrc/fs",           {tag, "0.8"}   }},
     {fs,     ".*", {git, "git://github.com/synrc/fs",           {tag, "0.8"}   }},

+ 1 - 1
src/mad.erl

@@ -107,7 +107,7 @@ help() ->
     io:format("    invoke := mad params~n"),
     io:format("    invoke := mad params~n"),
     io:format("    params := [] | run params ~n"),
     io:format("    params := [] | run params ~n"),
     io:format("       run := command [ options ]~n"),
     io:format("       run := command [ options ]~n"),
-    io:format("    commad := app | lib | deps | up | compile | release | bundle~n"),
+    io:format("   command := app | lib | deps | up | compile | release | bundle~n"),
     io:format("              clean | start | stop | attach | repl ~n"),
     io:format("              clean | start | stop | attach | repl ~n"),
     return(0).
     return(0).
 
 

+ 3 - 3
src/mad_repl.erl

@@ -40,12 +40,12 @@ load_config() ->
 acc_start(A,Acc) ->
 acc_start(A,Acc) ->
    case application:start(A) of
    case application:start(A) of
          {error,{already_started,_}} -> Acc;
          {error,{already_started,_}} -> Acc;
-         {error,{_,{{M,F,_},Ret}}} -> [M|Acc];
+         {error,{_,{{M,_F,_},_Ret}}} -> [M|Acc];
          {error,{_Reason,Name}} when is_atom(_Reason) -> [Name|Acc];
          {error,{_Reason,Name}} when is_atom(_Reason) -> [Name|Acc];
          ok -> Acc;
          ok -> Acc;
          _  -> Acc end.
          _  -> Acc end.
 
 
-load_apps([],_,Acc) ->
+load_apps([],_,_Acc) ->
   Res = lists:foldl(fun(A,Acc) -> case lists:member(A,system()) of
   Res = lists:foldl(fun(A,Acc) -> case lists:member(A,system()) of
        true -> acc_start(A,Acc);
        true -> acc_start(A,Acc);
           _ -> case load_config(A) of
           _ -> case load_config(A) of
@@ -55,7 +55,7 @@ load_apps([],_,Acc) ->
        [] -> ok;
        [] -> ok;
        _ -> io:format("\r\nApps couldn't be loaded: ~p~n\n\r",[Res]) end;
        _ -> io:format("\r\nApps couldn't be loaded: ~p~n\n\r",[Res]) end;
 load_apps(["applist"],Config,Acc) -> load_apps([],Config,Acc);
 load_apps(["applist"],Config,Acc) -> load_apps([],Config,Acc);
-load_apps(Params,_,Acc) -> [ application:ensure_all_started(list_to_atom(A))||A<-Params].
+load_apps(Params,_,_Acc) -> [ application:ensure_all_started(list_to_atom(A))||A<-Params].
 
 
 cwd() -> {ok, Cwd} = file:get_cwd(), Cwd.
 cwd() -> {ok, Cwd} = file:get_cwd(), Cwd.