Skip to content
Browse files

Fix grep invocations

  • Loading branch information...
1 parent bb67312 commit ebcae06928c431a36187153b4c8f3d4366479051 @tuncer tuncer committed Jan 9, 2011
Showing with 23 additions and 13 deletions.
  1. +10 −5 src/rebar_erlydtl_compiler.erl
  2. +13 −8 src/rebar_neotoma_compiler.erl
View
15 src/rebar_erlydtl_compiler.erl
@@ -162,14 +162,19 @@ referenced_dtls1(Step, Config, Seen) ->
DtlOpts = erlydtl_opts(Config),
ExtMatch = re:replace(option(source_ext, DtlOpts), "\.", "\\\\\\\\.",
[{return, list}]),
+
+ ShOpts = [{use_stdout, false}, return_on_error],
AllRefs =
lists:append(
[begin
- {ok, Res} = rebar_utils:sh(
- lists:flatten(["grep -o [^\\\"]*",
- ExtMatch," ",F]),
- [{use_stdout, false}]),
- string:tokens(Res, "\n")
+ Cmd = lists:flatten(["grep -o [^\\\"]*",
+ ExtMatch, " ", F]),
+ case rebar_utils:sh(Cmd, ShOpts) of
+ {ok, Res} ->
+ string:tokens(Res, "\n");
+ {error, _} ->
+ ""
+ end
end || F <- Step]),
DocRoot = option(doc_root, DtlOpts),
WithPaths = [ filename:join([DocRoot, F]) || F <- AllRefs ],
View
21 src/rebar_neotoma_compiler.erl
@@ -122,14 +122,19 @@ referenced_pegs1(Step, Config, Seen) ->
ExtMatch = re:replace(option(source_ext, NeoOpts), "\.", "\\\\\\\\.",
[{return, list}]),
- AllRefs = lists:append([begin
- {ok, Res} =
- rebar_utils:sh(
- lists:flatten(["grep -o [^\\\"]*",
- ExtMatch, " ", F]),
- [{use_stdout, false}]),
- string:tokens(Res, "\n")
- end || F <- Step]),
+ ShOpts = [{use_stdout, false}, return_on_error],
+ AllRefs =
+ lists:append(
+ [begin
+ Cmd = lists:flatten(["grep -o [^\\\"]*",
+ ExtMatch, " ", F]),
+ case rebar_utils:sh(Cmd, ShOpts) of
+ {ok, Res} ->
+ string:tokens(Res, "\n");
+ {error, _} ->
+ ""
+ end
+ end || F <- Step]),
DocRoot = option(doc_root, NeoOpts),
WithPaths = [ filename:join([DocRoot, F]) || F <- AllRefs ],
Existing = [F || F <- WithPaths, filelib:is_regular(F)],

0 comments on commit ebcae06

Please sign in to comment.
Something went wrong with that request. Please try again.