From 775d3dfc2ca36c06c97ab4059dd80e252331c6ed Mon Sep 17 00:00:00 2001
From: Darko Poljak <darko.poljak@gmail.com>
Date: Fri, 29 Sep 2017 19:34:52 +0200
Subject: [PATCH] shellcheck fixes

---
 cdist/conf/type/__apt_ppa/manifest            |  2 +-
 cdist/conf/type/__config_file/manifest        |  2 +-
 cdist/conf/type/__consul_agent/manifest       |  2 +-
 cdist/conf/type/__consul_check/manifest       |  2 +-
 cdist/conf/type/__consul_service/manifest     |  2 +-
 cdist/conf/type/__consul_template/manifest    |  2 +-
 .../type/__consul_template_template/manifest  |  2 +-
 .../conf/type/__consul_watch_checks/manifest  |  2 +-
 cdist/conf/type/__consul_watch_event/manifest |  2 +-
 cdist/conf/type/__consul_watch_key/manifest   |  2 +-
 .../type/__consul_watch_keyprefix/manifest    |  2 +-
 cdist/conf/type/__consul_watch_nodes/manifest |  2 +-
 .../conf/type/__consul_watch_service/manifest |  2 +-
 .../type/__consul_watch_services/manifest     |  2 +-
 .../conf/type/__firewalld_rule/gencode-remote |  2 +-
 .../__install_generate_fstab/gencode-local    |  4 +++-
 cdist/conf/type/__install_mkfs/manifest       | 19 ++++++++++++-------
 .../conf/type/__install_mount/gencode-remote  |  4 +++-
 .../gencode-remote                            |  4 +++-
 cdist/conf/type/__install_reboot/manifest     |  5 +++--
 cdist/conf/type/__install_umount/manifest     |  5 +++--
 cdist/conf/type/__jail/manifest               |  2 +-
 .../conf/type/__postgres_role/gencode-remote  |  2 +-
 cdist/conf/type/__rsync/gencode-local         |  2 +-
 .../type/__ssh_authorized_key/gencode-remote  |  2 +-
 .../conf/type/__ssh_authorized_keys/manifest  |  2 +-
 26 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/cdist/conf/type/__apt_ppa/manifest b/cdist/conf/type/__apt_ppa/manifest
index e1af21bd..7d637ad4 100755
--- a/cdist/conf/type/__apt_ppa/manifest
+++ b/cdist/conf/type/__apt_ppa/manifest
@@ -18,7 +18,7 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-name="$__object_id"
+# name="$__object_id"
 
 __package software-properties-common
 
diff --git a/cdist/conf/type/__config_file/manifest b/cdist/conf/type/__config_file/manifest
index 2e077db5..5381ded6 100755
--- a/cdist/conf/type/__config_file/manifest
+++ b/cdist/conf/type/__config_file/manifest
@@ -19,7 +19,7 @@
 #
 
 set -- "/${__object_id}"
-for param in "$__object/parameter/*"; do
+for param in $__object/parameter/*; do
    case "$param" in
       source)
          source="$(cat "$__object/parameter/source")"
diff --git a/cdist/conf/type/__consul_agent/manifest b/cdist/conf/type/__consul_agent/manifest
index 19db1582..e9c240d9 100755
--- a/cdist/conf/type/__consul_agent/manifest
+++ b/cdist/conf/type/__consul_agent/manifest
@@ -84,7 +84,7 @@ echo "{"
 # parameters we define ourself
 printf '   "data_dir": "%s"\n' "$data_dir"
 
-for param in "$__object/parameter/*"; do
+for param in $__object/parameter/*; do
    case "$param" in
       state|user|group|json-config) continue ;;
       ca-file-source|cert-file-source|key-file-source)
diff --git a/cdist/conf/type/__consul_check/manifest b/cdist/conf/type/__consul_check/manifest
index 52878767..85f9615c 100755
--- a/cdist/conf/type/__consul_check/manifest
+++ b/cdist/conf/type/__consul_check/manifest
@@ -50,7 +50,7 @@ fi
 echo "{"
 printf '   "check": {\n'
 printf '      "name": "%s"\n' "$name"
-for param in "$__object/parameter/*"; do
+for param in $__object/parameter/*; do
    case "$param" in
       state|name) continue ;;
       *)
diff --git a/cdist/conf/type/__consul_service/manifest b/cdist/conf/type/__consul_service/manifest
index 58872128..1d495b94 100755
--- a/cdist/conf/type/__consul_service/manifest
+++ b/cdist/conf/type/__consul_service/manifest
@@ -42,7 +42,7 @@ fi
 echo "{"
 printf '   "service": {\n'
 printf '      "name": "%s"\n' "$name"
-for param in "$__object/parameter/*"; do
+for param in $__object/parameter/*; do
    case "$param" in
       state|name|check-interval) continue ;;
       check-script)
diff --git a/cdist/conf/type/__consul_template/manifest b/cdist/conf/type/__consul_template/manifest
index 8fa6c31a..59cefd5d 100755
--- a/cdist/conf/type/__consul_template/manifest
+++ b/cdist/conf/type/__consul_template/manifest
@@ -75,7 +75,7 @@ require="__directory/etc/consul-template" \
 
 # Generate hcl config file
 (
-for param in "$__object/parameter/*"; do
+for param in $__object/parameter/*; do
    case "$param" in
       auth-password|state|ssl-*|syslog-*|version|vault-token|vault-ssl*) continue ;;
       auth-username)
diff --git a/cdist/conf/type/__consul_template_template/manifest b/cdist/conf/type/__consul_template_template/manifest
index 3931e3e3..946df8d6 100755
--- a/cdist/conf/type/__consul_template_template/manifest
+++ b/cdist/conf/type/__consul_template_template/manifest
@@ -38,7 +38,7 @@ fi
 # Generate hcl config file
 (
 printf 'template {\n'
-for param in "$__object/parameter/*"; do
+for param in $__object/parameter/*; do
    case "$param" in
       source-file)
          source="$(cat "$__object/parameter/$param")"
diff --git a/cdist/conf/type/__consul_watch_checks/manifest b/cdist/conf/type/__consul_watch_checks/manifest
index 0f0ff6be..80cefefd 100755
--- a/cdist/conf/type/__consul_watch_checks/manifest
+++ b/cdist/conf/type/__consul_watch_checks/manifest
@@ -35,7 +35,7 @@ fi
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-for param in "$__object/parameter/*"; do
+for param in $__object/parameter/*; do
    case "$param" in
       state) continue ;;
       filter-*)
diff --git a/cdist/conf/type/__consul_watch_event/manifest b/cdist/conf/type/__consul_watch_event/manifest
index 7ee4f9ac..b660e962 100755
--- a/cdist/conf/type/__consul_watch_event/manifest
+++ b/cdist/conf/type/__consul_watch_event/manifest
@@ -29,7 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-for param in "$__object/parameter/*"; do
+for param in $__object/parameter/*; do
    case "$param" in
       state) continue ;;
       *)
diff --git a/cdist/conf/type/__consul_watch_key/manifest b/cdist/conf/type/__consul_watch_key/manifest
index 7ee4f9ac..b660e962 100755
--- a/cdist/conf/type/__consul_watch_key/manifest
+++ b/cdist/conf/type/__consul_watch_key/manifest
@@ -29,7 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-for param in "$__object/parameter/*"; do
+for param in $__object/parameter/*; do
    case "$param" in
       state) continue ;;
       *)
diff --git a/cdist/conf/type/__consul_watch_keyprefix/manifest b/cdist/conf/type/__consul_watch_keyprefix/manifest
index 7ee4f9ac..b660e962 100755
--- a/cdist/conf/type/__consul_watch_keyprefix/manifest
+++ b/cdist/conf/type/__consul_watch_keyprefix/manifest
@@ -29,7 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-for param in "$__object/parameter/*"; do
+for param in $__object/parameter/*; do
    case "$param" in
       state) continue ;;
       *)
diff --git a/cdist/conf/type/__consul_watch_nodes/manifest b/cdist/conf/type/__consul_watch_nodes/manifest
index 7ee4f9ac..b660e962 100755
--- a/cdist/conf/type/__consul_watch_nodes/manifest
+++ b/cdist/conf/type/__consul_watch_nodes/manifest
@@ -29,7 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-for param in "$__object/parameter/*"; do
+for param in $__object/parameter/*; do
    case "$param" in
       state) continue ;;
       *)
diff --git a/cdist/conf/type/__consul_watch_service/manifest b/cdist/conf/type/__consul_watch_service/manifest
index 2825c716..6a8fe0ff 100755
--- a/cdist/conf/type/__consul_watch_service/manifest
+++ b/cdist/conf/type/__consul_watch_service/manifest
@@ -29,7 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-for param in $(ls "$__object/parameter/"); do
+for param in $__object/parameter/*; do
    case "$param" in
       state) continue ;;
       passingonly)
diff --git a/cdist/conf/type/__consul_watch_services/manifest b/cdist/conf/type/__consul_watch_services/manifest
index 7ee4f9ac..b660e962 100755
--- a/cdist/conf/type/__consul_watch_services/manifest
+++ b/cdist/conf/type/__consul_watch_services/manifest
@@ -29,7 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-for param in "$__object/parameter/*"; do
+for param in $__object/parameter/*; do
    case "$param" in
       state) continue ;;
       *)
diff --git a/cdist/conf/type/__firewalld_rule/gencode-remote b/cdist/conf/type/__firewalld_rule/gencode-remote
index f5252145..e1441234 100755
--- a/cdist/conf/type/__firewalld_rule/gencode-remote
+++ b/cdist/conf/type/__firewalld_rule/gencode-remote
@@ -19,7 +19,7 @@
 #
 #
 
-name="$__object_id"
+# name="$__object_id"
 state_should="$(cat "$__object/parameter/state")"
 state_is="$(cat "$__object/explorer/rule")"
 
diff --git a/cdist/conf/type/__install_generate_fstab/gencode-local b/cdist/conf/type/__install_generate_fstab/gencode-local
index aca42761..80455aaa 100755
--- a/cdist/conf/type/__install_generate_fstab/gencode-local
+++ b/cdist/conf/type/__install_generate_fstab/gencode-local
@@ -25,7 +25,9 @@ mkdir "$__object/files"
 # get current UUID's from target_host
 $__remote_exec "$__target_host" blkid > "$__object/files/blkid"
 
-for object in $(find "$__global/object/__install_mount" -type d -name "$__cdist_object_marker"); do
+find "$__global/object/__install_mount" -type d -name "$__cdist_object_marker" |
+while IFS= read -r object
+do
    device="$(cat "$object/parameter/device")"
    dir="$(cat "$object/parameter/dir")"
    type="$(cat "$object/parameter/type")"
diff --git a/cdist/conf/type/__install_mkfs/manifest b/cdist/conf/type/__install_mkfs/manifest
index eb65757f..9d0e05f6 100755
--- a/cdist/conf/type/__install_mkfs/manifest
+++ b/cdist/conf/type/__install_mkfs/manifest
@@ -19,13 +19,18 @@
 #
 
 # set defaults
-if [ -f "$__object/parameter/device" ]; then
-   device="(cat "$__object/parameter/device")"
-else
+# if [ -f "$__object/parameter/device" ]; then
+#    device="(cat "$__object/parameter/device")"
+# else
+#    device="/$__object_id"
+#    echo "$device" > "$__object/parameter/device"
+# fi
+
+# type="(cat "$__object/parameter/type")"
+
+# options="(cat "$__object/parameter/options")"
+
+if [ ! -f "$__object/parameter/device" ]; then
    device="/$__object_id"
    echo "$device" > "$__object/parameter/device"
 fi
-
-type="(cat "$__object/parameter/type")"
-
-options="(cat "$__object/parameter/options")"
diff --git a/cdist/conf/type/__install_mount/gencode-remote b/cdist/conf/type/__install_mount/gencode-remote
index ce96279a..4415f0ff 100755
--- a/cdist/conf/type/__install_mount/gencode-remote
+++ b/cdist/conf/type/__install_mount/gencode-remote
@@ -20,7 +20,9 @@
 
 get_type_from_mkfs() {
    _device="$1"
-   for mkfs_object in $(find "$__global/object/__install_mkfs" -type d -name "$__cdist_object_marker"); do
+   find "$__global/object/__install_mkfs" -type d -name "$__cdist_object_marker" |
+   while IFS= read -r mkfs_object
+   do
       mkfs_device="$(cat "$mkfs_object/parameter/device")"
       if [ "$_device" = "$mkfs_device" ]; then
          cat "$mkfs_object/parameter/type"
diff --git a/cdist/conf/type/__install_partition_msdos_apply/gencode-remote b/cdist/conf/type/__install_partition_msdos_apply/gencode-remote
index 72c65201..b4298c7c 100755
--- a/cdist/conf/type/__install_partition_msdos_apply/gencode-remote
+++ b/cdist/conf/type/__install_partition_msdos_apply/gencode-remote
@@ -59,7 +59,9 @@ size_to_mb() {
 
 get_objects() {
    objects_file=$(mktemp)
-   for object in $(find "$__global/object/__install_partition_msdos" -type d -name "$__cdist_object_marker"); do
+   find "$__global/object/__install_partition_msdos" -type d -name "$__cdist_object_marker" |
+   while IFS= read -r object
+   do
       object_device="$(cat "$object/parameter/device")"
       object_minor="$(cat "$object/parameter/minor")"
       echo "$object_device $object_minor $object" >> "$objects_file"
diff --git a/cdist/conf/type/__install_reboot/manifest b/cdist/conf/type/__install_reboot/manifest
index 02689d82..86ae797c 100755
--- a/cdist/conf/type/__install_reboot/manifest
+++ b/cdist/conf/type/__install_reboot/manifest
@@ -19,5 +19,6 @@
 #
 
 # set defaults
-options="$(cat "$__object/parameter/options" 2>/dev/null \
-   || echo "" | tee "$__object/parameter/options")"
+# options="$(cat "$__object/parameter/options" 2>/dev/null \
+#   || echo "" | tee "$__object/parameter/options")"
+cat "$__object/parameter/options" 2>/dev/null 1>/dev/null || echo "" > "$__object/parameter/options"
diff --git a/cdist/conf/type/__install_umount/manifest b/cdist/conf/type/__install_umount/manifest
index 42cd19bf..07753ac9 100755
--- a/cdist/conf/type/__install_umount/manifest
+++ b/cdist/conf/type/__install_umount/manifest
@@ -19,5 +19,6 @@
 #
 
 # set defaults
-target="$(cat "$__object/parameter/target" 2>/dev/null \
-   || echo "/target" | tee "$__object/parameter/target")"
+# target="$(cat "$__object/parameter/target" 2>/dev/null \
+#    || echo "/target" | tee "$__object/parameter/target")"
+cat "$__object/parameter/target" 2>/dev/null 1>/dev/null || echo "/target" > "$__object/parameter/target"
diff --git a/cdist/conf/type/__jail/manifest b/cdist/conf/type/__jail/manifest
index 63a2fab2..6fb4a306 100755
--- a/cdist/conf/type/__jail/manifest
+++ b/cdist/conf/type/__jail/manifest
@@ -44,7 +44,7 @@ for property in *; do
 done
 
 ver="$(cat "$__global/explorer/os_version")"
-if "$(echo "$ver" | grep -q '^10\.' )"; then   # Version is 10.x
+if echo "$ver" | grep -q '^10\.'; then   # Version is 10.x
    __jail_freebsd10 "$@"
 else
    __jail_freebsd9 "$@"
diff --git a/cdist/conf/type/__postgres_role/gencode-remote b/cdist/conf/type/__postgres_role/gencode-remote
index 14240992..f977e73e 100755
--- a/cdist/conf/type/__postgres_role/gencode-remote
+++ b/cdist/conf/type/__postgres_role/gencode-remote
@@ -34,7 +34,7 @@ case "$state_should" in
             if [ ! -f "$__object/parameter/$boolean" ]; then
                 boolean="no${boolean}"
             fi
-            upper=$(echo $boolean | tr '[a-z]' '[A-Z]')
+            upper=$(echo $boolean | tr '[:lower:]' '[:upper:]')
             booleans="$booleans $upper"
         done
 
diff --git a/cdist/conf/type/__rsync/gencode-local b/cdist/conf/type/__rsync/gencode-local
index c7196175..e36ded2f 100755
--- a/cdist/conf/type/__rsync/gencode-local
+++ b/cdist/conf/type/__rsync/gencode-local
@@ -29,7 +29,7 @@ fi
 
 set --
 if [ -f "$__object/parameter/rsync-opts" ]; then
-    while read opts; do
+    while read -r opts; do
         set -- "$@" "--$opts"
     done < "$__object/parameter/rsync-opts"
 fi
diff --git a/cdist/conf/type/__ssh_authorized_key/gencode-remote b/cdist/conf/type/__ssh_authorized_key/gencode-remote
index 325854c2..82c90d61 100755
--- a/cdist/conf/type/__ssh_authorized_key/gencode-remote
+++ b/cdist/conf/type/__ssh_authorized_key/gencode-remote
@@ -78,7 +78,7 @@ if [ -s "$__object/explorer/entry" ]; then
    # Note that the files have to be sorted for comparison with `comm`.
    sort "$__object/explorer/entry" > "$__object/files/is"
    comm -13 "$__object/files/should" "$__object/files/is" | {
-      while read entry; do
+      while read -r entry; do
          remove_line "$file" "$entry"
       done
    }
diff --git a/cdist/conf/type/__ssh_authorized_keys/manifest b/cdist/conf/type/__ssh_authorized_keys/manifest
index 8cac3449..f6ff74c3 100755
--- a/cdist/conf/type/__ssh_authorized_keys/manifest
+++ b/cdist/conf/type/__ssh_authorized_keys/manifest
@@ -61,7 +61,7 @@ _cksum() {
    echo "$1" | cksum | cut -d' ' -f 1
 }
 
-while read key; do
+while read -r key; do
    type_and_key="$(echo "$key" | tr ' ' '\n' | awk '/^(ssh|ecdsa)-[^ ]+/ { printf $1" "; getline; printf $1 }')"
    object_id="$(_cksum "$file")-$(_cksum "$type_and_key")"
    set -- "$object_id"