From a742750234086874667cda2c14d3cb205cae3728 Mon Sep 17 00:00:00 2001
From: Brad Lugo <blugo@redhat.com>
Date: Tue, 14 Mar 2023 15:13:57 -0700
Subject: [PATCH] Make create-consolidated-values.sh more portable (#814)

---
 scripts/create-consolidated-values.sh | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/scripts/create-consolidated-values.sh b/scripts/create-consolidated-values.sh
index e2b0f9f6c..17eb2e76c 100755
--- a/scripts/create-consolidated-values.sh
+++ b/scripts/create-consolidated-values.sh
@@ -27,21 +27,13 @@ create_consolidated_values() {
     } >> "$values_file"
 
     pushd "$ROOT/chart/infra-server/configuration/$environment" > /dev/null
-    shopt -s globstar nullglob
-    for cfg_file in **; do
-        if [[ -d "$cfg_file" ]]; then
-            continue
-        fi
-        if [[ "$cfg_file" =~ (README|DS_Store) ]]; then
-            continue
-        fi
-
-        local helm_safe_key="${cfg_file//[.-]/_}"
-        helm_safe_key="${helm_safe_key////__}"
-
-        echo "$helm_safe_key: $(base64 < "$cfg_file" | tr -d '\n')" >> "$values_file"
-        echo >> "$values_file"
-    done
+    while IFS='' read -r cfg_file; do
+      local helm_safe_key="${cfg_file//[.-]/_}"
+      helm_safe_key="${helm_safe_key////__}"
+
+      echo "$helm_safe_key: $(base64 < "$cfg_file" | tr -d '\n')" >> "$values_file"
+      echo >> "$values_file"
+    done < <(find . -type f -not -name '*.md' -not -name '*.DS_Store' | cut -c3-)
     popd > /dev/null
 }