From 97133735ccfb7db405b3b8c80942f1d8590cd48a Mon Sep 17 00:00:00 2001 From: Andrew Walsh Date: Wed, 20 Jul 2022 10:58:33 -0700 Subject: [PATCH 1/2] Fix cut regression. Originally fixed in #17. This was reintroduced when master was sync'd to staging. --- pre_cache_action.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pre_cache_action.sh b/pre_cache_action.sh index 7921adb..1917b2e 100755 --- a/pre_cache_action.sh +++ b/pre_cache_action.sh @@ -59,7 +59,7 @@ log "- Normalized package list is '${normalized_versioned_packages}'." value="${normalized_versioned_packages} @ ${version}" log "- Value to hash is '${value}'." -key="$(echo "${value}" | md5sum | /bin/cut -f1 -d' ')" +key="$(echo "${value}" | md5sum | cut -f1 -d' ')" log "- Value hashed as '${key}'." log "done." From 8a5dc6c11e457eb5b39d3e26cb699c1cda500aa2 Mon Sep 17 00:00:00 2001 From: Alex Kaszynski Date: Thu, 21 Jul 2022 14:11:04 +0000 Subject: [PATCH 2/2] Update pre_cache_action.sh --- pre_cache_action.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pre_cache_action.sh b/pre_cache_action.sh index 1917b2e..1cc41e9 100755 --- a/pre_cache_action.sh +++ b/pre_cache_action.sh @@ -37,7 +37,7 @@ log "done." versioned_packages="" log -n "Verifying packages..." for package in ${packages}; do - if test ! "$(apt show "${package}")"; then + if test ! "$(apt-get show "${package}")"; then echo "aborted." log "Package '${package}' not found." >&2 exit 3