From 34b571b7d9d98451910650339231c3c3c06cfb61 Mon Sep 17 00:00:00 2001
From: Jonas Weber <github@jonasw.de>
Date: Thu, 4 Oct 2018 22:22:22 +0200
Subject: [PATCH] Fix SC2091 (execute result of condition)

For some reason, the echo|grep pattern was enclosed four times in a $()
operation. Nothing happened, since grep is always invoked with -q
(quiet, nothing printed to stdout).
---
 cdist/conf/type/__file/gencode-local           | 2 +-
 cdist/conf/type/__jail_freebsd10/gencode-local | 2 +-
 cdist/conf/type/__jail_freebsd9/gencode-local  | 2 +-
 cdist/conf/type/__user/gencode-remote          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cdist/conf/type/__file/gencode-local b/cdist/conf/type/__file/gencode-local
index 3f60b4b3..fb9f9a92 100755
--- a/cdist/conf/type/__file/gencode-local
+++ b/cdist/conf/type/__file/gencode-local
@@ -84,7 +84,7 @@ DONE
       if [ "$upload_file" ]; then
          echo upload >> "$__messages_out"
          # IPv6 fix
-         if $(echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$')
+         if echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$'
          then
              my_target_host="[${__target_host}]"
          else
diff --git a/cdist/conf/type/__jail_freebsd10/gencode-local b/cdist/conf/type/__jail_freebsd10/gencode-local
index b2016f86..f163cad3 100755
--- a/cdist/conf/type/__jail_freebsd10/gencode-local
+++ b/cdist/conf/type/__jail_freebsd10/gencode-local
@@ -44,7 +44,7 @@ basepresent="$(cat "$__object/explorer/basepresent")"
 if [ "$state" = "present" ]; then
    if [ "$basepresent" = "NONE" ]; then
      # IPv6 fix
-     if $(echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$')
+     if echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$'
      then
          my_target_host="[${__target_host}]"
      else
diff --git a/cdist/conf/type/__jail_freebsd9/gencode-local b/cdist/conf/type/__jail_freebsd9/gencode-local
index 1ab7ff1a..bbdc9fcc 100755
--- a/cdist/conf/type/__jail_freebsd9/gencode-local
+++ b/cdist/conf/type/__jail_freebsd9/gencode-local
@@ -40,7 +40,7 @@ basepresent="$(cat "$__object/explorer/basepresent")"
 if [ "$state" = "present" ]; then
    if [ "$basepresent" = "NONE" ]; then
      # IPv6 fix
-     if $(echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$')
+     if echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$'
      then
          my_target_host="[${__target_host}]"
      else
diff --git a/cdist/conf/type/__user/gencode-remote b/cdist/conf/type/__user/gencode-remote
index 332e93f1..a1347a6f 100755
--- a/cdist/conf/type/__user/gencode-remote
+++ b/cdist/conf/type/__user/gencode-remote
@@ -60,7 +60,7 @@ if [ "$state" = "present" ]; then
 
           case "$property" in
              gid)
-                if $(echo "$new_value" | grep -q '^[0-9][0-9]*$'); then
+                if echo "$new_value" | grep -q '^[0-9][0-9]*$'; then
                    field=4
                 else
                    # We were passed a group name.  Compare the gid in