From 7799804277e6fd38d308ebd581d194c38cd3fbb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 10 Dec 2018 12:28:57 +0100 Subject: Correct expanding of shell variables in autopatch again This solution should work better, previous one would sometimes expand incorrectly and fail. --- core/deps.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/deps.mk b/core/deps.mk index ed92daf..bfcae30 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -395,7 +395,7 @@ define dep_autopatch_rebar.erl end(), ShellToMk = fun(V0) -> V1 = re:replace(V0, "[$$][(]", "$$\(shell ", [global]), - V = re:replace(V1, "(\\\\$$$$)(?![(])(\\\\w*)", "\\\\1(\\\\2)", [global]), + V = re:replace(V1, "([$$])(?![(])(\\\\w*)", "\\\\1(\\\\2)", [global]), re:replace(V, "-Werror\\\\b", "", [{return, list}, global]) end, PortSpecs = fun() -> -- cgit v1.2.3