From fff5e48266b957e945236589ea0ea6393a6a33ff Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Mon, 28 Jul 2014 15:04:48 +0200 Subject: [PATCH 1/2] /index/match/ Signed-off-by: Steven Armstrong --- cdist/conf/type/__block/gencode-remote | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdist/conf/type/__block/gencode-remote b/cdist/conf/type/__block/gencode-remote index 973e9922..c4788040 100755 --- a/cdist/conf/type/__block/gencode-remote +++ b/cdist/conf/type/__block/gencode-remote @@ -48,11 +48,11 @@ if [ -f "$file" ]; then fi awk -v prefix="^$prefix\\\$" -v suffix="^$suffix\\\$" ' { - if (index(\$0,prefix)) { + if (match(\$0,prefix)) { triggered=1 } if (triggered) { - if (index(\$0,suffix)) { + if (match(\$0,suffix)) { triggered=0 } } else { From 3dbe375837d69ff4d14e4f853326c487482aadec Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Mon, 28 Jul 2014 15:05:45 +0200 Subject: [PATCH 2/2] no need to double escape a trailing $; $ by itself is not special in any way Signed-off-by: Steven Armstrong --- cdist/conf/type/__block/gencode-remote | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdist/conf/type/__block/gencode-remote b/cdist/conf/type/__block/gencode-remote index c4788040..2e2147e5 100755 --- a/cdist/conf/type/__block/gencode-remote +++ b/cdist/conf/type/__block/gencode-remote @@ -46,7 +46,7 @@ tmpfile=\$(mktemp ${file}.cdist.XXXXXXXXXX) if [ -f "$file" ]; then cp -p "$file" "\$tmpfile" fi -awk -v prefix="^$prefix\\\$" -v suffix="^$suffix\\\$" ' +awk -v prefix="^$prefix\$" -v suffix="^$suffix\$" ' { if (match(\$0,prefix)) { triggered=1