From f039b0e6e5e4d90793061cc2a6dc73883367d767 Mon Sep 17 00:00:00 2001
From: Darko Poljak <darko.poljak@gmail.com>
Date: Sat, 6 Oct 2018 08:36:06 +0200
Subject: [PATCH] Fix SC2030,SC2031.

---
 cdist/conf/type/__consul_template_template/manifest | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/cdist/conf/type/__consul_template_template/manifest b/cdist/conf/type/__consul_template_template/manifest
index 506bc528..1eae1fad 100755
--- a/cdist/conf/type/__consul_template_template/manifest
+++ b/cdist/conf/type/__consul_template_template/manifest
@@ -35,9 +35,13 @@ if [ ! -f "$__object/parameter/source" ] && [ ! -f "$__object/parameter/source-f
    exit 1
 fi
 
+if [ -f "$__object/parameter/source-file" ]; then
+    destination="${template_dir}/${name}"
+    require="__file${destination}"
+fi
+
 # Generate hcl config file
-# shellcheck disable=SC2031
-(
+{
 printf 'template {\n'
 cd "$__object/parameter/"
 for param in *; do
@@ -47,14 +51,11 @@ for param in *; do
          if [ "$source" = "-" ]; then
             source="$__object/stdin"
          fi
-         destination="${template_dir}/${name}"
          require="__directory${template_dir}" \
             __file "$destination" \
                --owner root --group root --mode 640 \
                --source "$source" \
                --state "$state"
-         # shellcheck disable=SC2030
-         export require="__file${destination}"
          printf '   source = "%s"\n' "$destination"
 
       ;;
@@ -68,7 +69,7 @@ for param in *; do
    esac
 done
 printf '}\n'
-) | \
+} | \
 require="$require __directory${conf_dir}" \
    __config_file "${conf_dir}/${conf_file}" \
       --owner root --group root --mode 640 \