From 4e1fb0166e48c8c0b0cc5869df7bac2899fa70b8 Mon Sep 17 00:00:00 2001 From: Erik Flodin Date: Sun, 18 Oct 2020 22:40:06 +0200 Subject: [PATCH] Reuse if pattern in template_default's condition pattern --- yadm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yadm b/yadm index 6823886..49c0844 100755 --- a/yadm +++ b/yadm @@ -352,11 +352,11 @@ BEGIN { c["user"] = user c["distro"] = distro c["source"] = source - vld = conditions() ifs = "^{%" blank "*if" els = "^{%" blank "*else" blank "*%}$" end = "^{%" blank "*endif" blank "*%}$" skp = "^{%" blank "*(if|else|endif)" + vld = conditions() inc_start = "^{%" blank "*include" blank "+\"?" inc_end = "\"?" blank "*%}$" inc = inc_start ".+" inc_end @@ -400,7 +400,7 @@ function replace_vars() { } } function conditions() { - pattern = "^{%" blank "*if" blank "*(" + pattern = ifs blank "*(" for (label in c) { value = c[label] gsub(/[\\.^$(){}\[\]|*+?]/, "\\\\&", value)