catmeow/cache-apt-pkgs-action
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix package enumeration.

Browse source
This commit is contained in:
awalsh128 2022-06-30 01:35:13 -07:00
parent 686ae5cbb1
commit cb0990bfa2
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
post_cache_action.sh
View file

@ -19,7 +19,7 @@ packages="${@:4}"
script_dir="$(dirname -- "$(realpath -- "${0}")")" script_dir="$(dirname -- "$(realpath -- "${0}")")"
if [ "$cache_hit" == true ]; then 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 else
${script_dir}/install_and_cache_pkgs.sh ~/cache-apt-pkgs ${packages} ${script_dir}/install_and_cache_pkgs.sh ~/cache-apt-pkgs ${packages}
fi fi

12
restore_pkgs.sh
View file

@ -10,25 +10,25 @@ cache_dir="${1}"
# Typically filesystem root '/' but can be changed for testing. # Typically filesystem root '/' but can be changed for testing.
cache_restore_root="${2}" 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." echo "Found $(echo ${cache_filepaths} | wc -w) files in the cache."
for cache_filepath in ${cache_filepaths}; do for cache_filepath in ${cache_filepaths}; do
echo "- $(basename ${cache_filepath})" echo "- "$(basename ${cache_filepath})""
done done
echo "Reading from manifest..." 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 ':' ' ')" echo "- $(echo "${logline}" | tr ':' ' ')"
done done
echo "done." echo "done."
# Only search for archived results. Manifest and cache key also live here. # 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) cache_pkg_filecount=$(echo ${cache_pkg_filepaths} | wc -w)
echo "Restoring ${cache_pkg_filecount} packages from cache..." echo "Restoring ${cache_pkg_filecount} packages from cache..."
for cache_pkg_filepath in ${cache_pkg_filepaths}; do for cache_pkg_filepath in ${cache_pkg_filepaths}; do
echo -n "- $(basename ${cache_pkg_filepath}) restoring..." echo -n "- $(basename "${cache_pkg_filepath}") restoring..."
sudo tar -xf ${cache_pkg_filepath} -C ${cache_restore_root} > /dev/null sudo tar -xf "${cache_pkg_filepath}" -C "${cache_restore_root}" > /dev/null
echo "done." echo "done."
done done
echo "done." echo "done."