From 83a85683c8ba14c52e82622c28b6a845a9edc70d Mon Sep 17 00:00:00 2001
From: Thilo Fromm <thilo@kinvolk.io>
Date: Mon, 22 May 2023 12:14:04 +0200
Subject: [PATCH] Apply suggestions from code review

Co-authored-by: Krzesimir Nowak <knowak@microsoft.com>
---
 ci-automation/garbage_collect.sh               |  4 ++--
 ci-automation/garbage_collect_github_ci_sdk.sh | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ci-automation/garbage_collect.sh b/ci-automation/garbage_collect.sh
index e8dbc92c11..3e0d0a8d58 100644
--- a/ci-automation/garbage_collect.sh
+++ b/ci-automation/garbage_collect.sh
@@ -147,7 +147,7 @@ function _garbage_collect_impl() {
     echo
     echo "########################################"
     echo
-    echo    Running cloud garbace collector
+    echo    Running cloud garbage collector
     echo
 
     local mantle_ref
@@ -165,7 +165,7 @@ function _garbage_collect_impl() {
     echo
     echo "#############################################"
     echo
-    echo    Running Github CI SDK garbace collector
+    echo    Running Github CI SDK garbage collector
     echo
 
     source ci-automation/garbage_collect_github_ci_sdk.sh
diff --git a/ci-automation/garbage_collect_github_ci_sdk.sh b/ci-automation/garbage_collect_github_ci_sdk.sh
index 2388e58db8..4a14d0a687 100644
--- a/ci-automation/garbage_collect_github_ci_sdk.sh
+++ b/ci-automation/garbage_collect_github_ci_sdk.sh
@@ -55,9 +55,9 @@ function _garbage_collect_github_ci_impl() {
     echo "######## Full list of version(s) found ########"
     echo "${versions_sorted}" | awk '{printf "%5d %s\n", NR, $0}'
 
-    local keep="$((keep + 1))" # for tail -n+...
-    local purge_versions="$(echo "${versions_sorted}" \
-                            | tail -n+"${keep}")"
+    keep="$((keep + 1))" # for tail -n+...
+    local purge_versions
+    mapfile -t purge_versions < <(tail -n+"${keep}" <<<"${versions_sorted}")
 
     source ci-automation/ci_automation_common.sh
     local sshcmd="$(gen_sshcmd)"
@@ -69,12 +69,12 @@ function _garbage_collect_github_ci_impl() {
         echo "(NOTE this is just a dry run since DRY_RUN=y)"
         echo
     fi
-    echo "${purge_versions}" | awk -v keep="${keep}" '{if ($0 == "") next; printf "%5d %s\n", NR + keep - 1, $0}'
+    printf '%s\n' "${purge_versions[@]}" | awk -v keep="${keep}" '{if ($0 == "") next; printf "%5d %s\n", NR + keep - 1, $0}'
     echo
     echo
 
     local version=""
-    for version in ${purge_versions}; do
+    for version in "${purge_versions[@]}"; do
         echo "--------------------------------------------"
         echo
         echo "#### Processing version '${version}' ####"