From cb0990bfa293a145334e634cc744ccffc7364273 Mon Sep 17 00:00:00 2001
From: awalsh128 <awalsh128@gomail.com>
Date: Thu, 30 Jun 2022 01:35:13 -0700
Subject: [PATCH] Fix package enumeration.

---
 post_cache_action.sh |  2 +-
 restore_pkgs.sh      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/post_cache_action.sh b/post_cache_action.sh
index 56fda54..8440aa3 100755
--- a/post_cache_action.sh
+++ b/post_cache_action.sh
@@ -19,7 +19,7 @@ packages="${@:4}"
 script_dir="$(dirname -- "$(realpath -- "${0}")")"
 
 if [ "$cache_hit" == true ]; then
-  ${script_dir}/restore_pkgs.sh ~/cache-apt-pkgs ${cache_restore_root}
+  ${script_dir}/restore_pkgs.sh ~/cache-apt-pkgs "${cache_restore_root}"
 else
   ${script_dir}/install_and_cache_pkgs.sh ~/cache-apt-pkgs ${packages}
 fi
diff --git a/restore_pkgs.sh b/restore_pkgs.sh
index 3cee703..e7b2e10 100755
--- a/restore_pkgs.sh
+++ b/restore_pkgs.sh
@@ -10,25 +10,25 @@ cache_dir="${1}"
 # Typically filesystem root '/' but can be changed for testing.
 cache_restore_root="${2}"
 
-cache_filepaths=$(ls -1 ${cache_dir} | sort)
+cache_filepaths="$(ls -1 "${cache_dir}" | sort)"
 echo "Found $(echo ${cache_filepaths} | wc -w) files in the cache."
 for cache_filepath in ${cache_filepaths}; do
-  echo "- $(basename ${cache_filepath})"
+  echo "- "$(basename ${cache_filepath})""
 done
 
 echo "Reading from manifest..."
-for logline in "$(cat "${cache_dir}/manifest.log" | tr ',' '\n' )"; do
+for logline in $(cat "${cache_dir}/manifest.log" | tr ',' '\n' ); do
   echo "- $(echo "${logline}" | tr ':' ' ')"
 done
 echo "done."
 
 # Only search for archived results. Manifest and cache key also live here.
-cache_pkg_filepaths=$(ls -1 ${cache_dir}/*.tar.gz | sort)
+cache_pkg_filepaths=$(ls -1 "${cache_dir}"/*.tar.gz | sort)
 cache_pkg_filecount=$(echo ${cache_pkg_filepaths} | wc -w)
 echo "Restoring ${cache_pkg_filecount} packages from cache..."
 for cache_pkg_filepath in ${cache_pkg_filepaths}; do
-  echo -n "- $(basename ${cache_pkg_filepath}) restoring..."
-  sudo tar -xf ${cache_pkg_filepath} -C ${cache_restore_root} > /dev/null
+  echo -n "- $(basename "${cache_pkg_filepath}") restoring..."
+  sudo tar -xf "${cache_pkg_filepath}" -C "${cache_restore_root}" > /dev/null
   echo "done."
 done
 echo "done."