From cb1a5b945c30b17a1949234d86c739fc032219ee Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sun, 8 Mar 2015 18:05:37 -0500 Subject: templater: return error, don't throw, if git or hg fail --- src/rebar_templater.erl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rebar_templater.erl b/src/rebar_templater.erl index 588f5b2..824d376 100644 --- a/src/rebar_templater.erl +++ b/src/rebar_templater.erl @@ -143,9 +143,9 @@ default_variables() -> default_author_and_email() -> %% See if we can get a git user and email to use as defaults - case rebar_utils:sh("git config --global user.name", []) of + case rebar_utils:sh("git config --global user.name", [return_on_error]) of {ok, Name} -> - case rebar_utils:sh("git config --global user.email", []) of + case rebar_utils:sh("git config --global user.email", [return_on_error]) of {ok, Email} -> {string:strip(Name, both, $\n), string:strip(Email, both, $\n)}; {error, _} -> @@ -154,7 +154,7 @@ default_author_and_email() -> end; {error, _} -> %% Ok, try mecurial - case rebar_utils:sh("hg showconfig ui.username", []) of + case rebar_utils:sh("hg showconfig ui.username", [return_on_error]) of {ok, NameEmail} -> case re:run(NameEmail, [{capture, [1,2], list}]) of {match, [Name, Email]} -> -- cgit v1.1