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

Use filename:join/2 in some cases

Sina Samavati 11 лет назад
Родитель
Сommit
81b9005ef3
3 измененных файлов с 11 добавлено и 11 удалено
  1. 3 3
      src/mad_compile.erl
  2. 2 2
      src/mad_deps.erl
  3. 6 6
      src/mad_utils.erl

+ 3 - 3
src/mad_compile.erl

@@ -73,13 +73,13 @@ app(Dir) ->
 
 compile_fun(SrcDir, EbinDir, IncDir) ->
     fun(F) ->
-            F1 = filename:join([SrcDir, F]),
+            F1 = filename:join(SrcDir, F),
             case is_app_src(F1) of
                 false ->
                     io:format("Compiling ~s~n", [F1]),
                     compile:file(F1, ?COMPILE_OPTS(IncDir, EbinDir));
                 true ->
-                    AppFile = filename:join([EbinDir, app_src_to_app(F1)]),
+                    AppFile = filename:join(EbinDir, app_src_to_app(F1)),
                     io:format("Writing ~s~n", [AppFile]),
                     mad_utils:exec("cp", [F1, AppFile])
             end,
@@ -96,4 +96,4 @@ is_app_src(Filename) ->
     Filename =/= filename:rootname(Filename, ".app.src").
 
 app_src_to_app(Filename) ->
-    filename:join([filename:basename(Filename, ".app.src") ++ ".app"]).
+    filename:basename(Filename, ".app.src") ++ ".app".

+ 2 - 2
src/mad_deps.erl

@@ -100,7 +100,7 @@ ebins(Deps) ->
 ebins([], Acc) ->
     Acc;
 ebins([H|T], Acc) ->
-    ebins(T, [filename:join([H, "ebin"])|Acc]).
+    ebins(T, [filename:join(H, "ebin")|Acc]).
 
 make_dep_name(Name, Suffix) ->
     %% Name-Suffix
@@ -116,4 +116,4 @@ name_and_repo({Name, _, Repo, _}) ->
 
 path(X) ->
     %% ~/.otp/deps/X
-    filename:join([?DEPS_PATH, X]).
+    filename:join(?DEPS_PATH, X).

+ 6 - 6
src/mad_utils.erl

@@ -38,19 +38,19 @@ home() ->
     H.
 
 rebar_conf_file(X) ->
-    filename:absname(filename:join([X, "rebar.config"])).
+    filename:absname(filename:join(X, "rebar.config")).
 
 src(X) ->
     %% X/src
-    filename:join([X, "src"]).
+    filename:join(X, "src").
 
 include(X) ->
     %% X/include
-    filename:join([X, "include"]).
+    filename:join(X, "include").
 
 ebin(X) ->
     %% X/ebin
-    filename:join([X, "ebin"]).
+    filename:join(X, "ebin").
 
 consult(File) ->
     AbsFile = filename:absname(File),
@@ -72,7 +72,7 @@ get_value(Key, Opts, Default) ->
     end.
 
 script(Dir, Conf) ->
-    File = filename:join([Dir, "rebar.config.script"]),
+    File = filename:join(Dir, "rebar.config.script"),
     case file:script(File, [{'CONFIG', Conf}]) of
         {ok, Out} ->
             Out;
@@ -86,7 +86,7 @@ sub_dirs(Cwd, Conf) ->
 sub_dirs(_, [], Acc) ->
     Acc;
 sub_dirs(Cwd, [Dir|T], Acc) ->
-    SubDir = filename:join([Cwd, Dir]),
+    SubDir = filename:join(Cwd, Dir),
     Conf = consult(rebar_conf_file(SubDir)),
     Conf1 = script(SubDir, Conf),
     Acc1 = sub_dirs(SubDir, get_value(sub_dirs, Conf1, []), Acc),