From a6ddcda88e1e139a650253dc63ea36a80b3eb478 Mon Sep 17 00:00:00 2001
From: Thilo Fromm <thilo@kinvolk.io>
Date: Fri, 7 Jan 2022 20:09:49 +0100
Subject: [PATCH] ci-automation: Apply suggestions from PR review

Co-authored-by: Krzesimir Nowak <knowak@microsoft.com>
---
 build_library/toolchain_util.sh  | 6 +++---
 ci-automation/garbage_collect.sh | 2 +-
 ci-automation/push_pkgs.sh       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh
index f64fd3bd6f..e88981a479 100644
--- a/build_library/toolchain_util.sh
+++ b/build_library/toolchain_util.sh
@@ -142,13 +142,13 @@ get_board_binhost() {
     board="$1"
     shift
 
-    local no_toolchain=0
+    local pkgs_include_toolchain=0
     if [[ $# -eq 0 ]]; then
         if [[ "${FLATCAR_BUILD_ID}" =~ ^nightly-.*$ ]] ; then
             # containerised nightly build; this uses [VERSION]-[BUILD_ID] for binpkg url
             #  and toolchain packages are at the same location as OS image ones
             set -- "${FLATCAR_VERSION_ID}-${FLATCAR_BUILD_ID}"
-            no_toolchain=1
+            pkgs_include_toolchain=1
         else
             set -- "${FLATCAR_VERSION_ID}"
         fi
@@ -158,7 +158,7 @@ get_board_binhost() {
         if [[ $toolchain_only -eq 0 ]]; then
             echo "${FLATCAR_DEV_BUILDS}/boards/${board}/${ver}/pkgs/"
         fi
-        if [[ $no_toolchain -eq 0 ]]; then
+        if [[ $pkgs_include_toolchain -eq 0 ]]; then
             echo "${FLATCAR_DEV_BUILDS}/boards/${board}/${ver}/toolchain/"
         fi
     done
diff --git a/ci-automation/garbage_collect.sh b/ci-automation/garbage_collect.sh
index f1ce917d1f..02003ac6b9 100644
--- a/ci-automation/garbage_collect.sh
+++ b/ci-automation/garbage_collect.sh
@@ -89,7 +89,7 @@ function garbage_collect() {
         else
             echo "## ${version} is an OS image version. ##"
             rmpat="${BUILDCACHE_PATH_PREFIX}/containers/${os_docker_vernum}/flatcar-packages-*"
-            rmpat="${BUILDCACHE_PATH_PREFIX}/binpkgs/boards/*/${os_docker_vernum}/*"
+            rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/binpkgs/boards/*/${os_docker_vernum}/*"
             rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/containers/${os_docker_vernum}/flatcar-images-*"
             rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/images/*/${os_vernum}/"
         fi
diff --git a/ci-automation/push_pkgs.sh b/ci-automation/push_pkgs.sh
index f7591b5a77..f9d764e71c 100644
--- a/ci-automation/push_pkgs.sh
+++ b/ci-automation/push_pkgs.sh
@@ -19,7 +19,7 @@
 #   2. Scripts repo version tag of OS image version to be built is available and checked out.
 #   3. Flatcar packages container is available via build cache server
 #       from "/containers/[VERSION]/flatcar-packages-[ARCH]-[FLATCAR_VERSION].tar.gz"
-#       or present locally. Container must contain binary packages and torcx artefacts.
+#       or present locally. Container must contain binary packages and torcx artifacts.
 #
 # INPUT:
 #