if/elif bsd matcher

epiccastle · Jul 5, 2020 · 6c39faf · 6c39faf
1 parent 21617d6
commit 6c39faf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/clj/spire/module/line_in_file_present.sh b/src/clj/spire/module/line_in_file_present.sh
@@ -34,7 +34,7 @@ if [ "$LINENUM" ]; then
   fi
 fi
 
-# :present by regexp or string-match
+# :present by regexp or string-match or line-match
 if [ "$REGEX" ] || [ "$STRING_MATCH" ] || [ "$LINE_MATCH" ]; then
   if [ "$REGEX" ]; then
     LINENUMS=$(sed -n "${REGEX}=" "$FILE" | $SELECTOR)

diff --git a/src/clj/spire/module/line_in_file_present_bsd.sh b/src/clj/spire/module/line_in_file_present_bsd.sh
@@ -35,16 +35,14 @@ ${SEDLINE}\\
   fi
 fi
 
-# :present by regexp or string-match
+# :present by regexp or string-match or line-match
 if [ "$REGEX" ] || [ "$STRING_MATCH" ] || [ "$LINE_MATCH" ]; then
   if [ "$REGEX" ]; then
     LINENUMS=$(sed -n "${REGEX}=" "$FILE" | $SELECTOR)
+  elif [ "$STRING_MATCH" ]; then
+    LINENUMS=$(grep -n -F "${STRING_MATCH}" "$FILE" | $SELECTOR | cut -d: -f1)
   else
-    if [ "$STRING_MATCH" ]; then
-      LINENUMS=$(grep -n -F "${STRING_MATCH}" "$FILE" | cut -d: -f1 | $SELECTOR)
-    else
-      LINENUMS=$(grep -n -x -F "${LINE_MATCH}" "$FILE" | cut -d: -f1 | $SELECTOR)
-    fi
+    LINENUMS=$(grep -n -x -F "${LINE_MATCH}" "$FILE" | $SELECTOR | cut -d: -f1)
   fi
 
   if [ "$LINENUMS" ]; then