From fb26894cbd45268b62eb40d4ed285dd557ea4f6c Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Fri, 18 May 2018 16:57:34 +0200
Subject: [PATCH] when searching treat line as string, and regex as regexp

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 cdist/conf/type/__line/explorer/state | 13 ++++++++++---
 cdist/conf/type/__line/gencode-remote |  9 ++++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/cdist/conf/type/__line/explorer/state b/cdist/conf/type/__line/explorer/state
index 1f81b540..d27bca18 100755
--- a/cdist/conf/type/__line/explorer/state
+++ b/cdist/conf/type/__line/explorer/state
@@ -37,6 +37,13 @@ else
 fi
 
 awk -v position="$position" -v needle="$needle" '
+function _find(_text, _pattern) {
+   if (needle == "regex") {
+      return match(_text, _pattern)
+   } else {
+      return index(_text, _pattern)
+   }
+}
 BEGIN {
    getline anchor < (ENVIRON["__object"] "/parameter/" position)
    getline pattern < (ENVIRON["__object"] "/parameter/" needle)
@@ -46,7 +53,7 @@ BEGIN {
    if (position == "after") {
       if (match($0, anchor)) {
          getline
-         if (match($0, pattern)) {
+         if (_find($0, pattern)) {
             state = "present"
          }
          else {
@@ -56,7 +63,7 @@ BEGIN {
       }
    }
    else if (position == "before") {
-      if (match($0, pattern)) {
+      if (_find($0, pattern)) {
          getline
          if (match($0, anchor)) {
             state = "present"
@@ -68,7 +75,7 @@ BEGIN {
       }
    }
    else {
-      if (match($0, pattern)) {
+      if (_find($0, pattern)) {
          state = "present"
          exit 0
       }
diff --git a/cdist/conf/type/__line/gencode-remote b/cdist/conf/type/__line/gencode-remote
index 7951ea49..996029f5 100755
--- a/cdist/conf/type/__line/gencode-remote
+++ b/cdist/conf/type/__line/gencode-remote
@@ -78,6 +78,13 @@ if [ -f "$file" ]; then
 fi
 
 awk -v position="$position" -v needle="$needle" -v remove=$remove -v add=$add '
+function _find(_text, _pattern) {
+   if (needle == "regex") {
+      return match(_text, _pattern)
+   } else {
+      return index(_text, _pattern)
+   }
+}
 BEGIN {
    line_file = ENVIRON["__object"] "/parameter/line"
    getline line < line_file
@@ -88,7 +95,7 @@ BEGIN {
 }
 {
    if (remove) {
-      if (match(\$0, pattern)) {
+      if (_find(\$0, pattern)) {
          # skip over this line -> remove it
          next
       }