actions/cache-apt-pkgs-action
1
0
Fork 0
mirror of https://github.com/awalsh128/cache-apt-pkgs-action.git synced 2026-01-07 02:52:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

more shell bullshit

Browse source
This commit is contained in:
Mahyar McDonald 2025-11-03 18:33:49 -08:00
parent 6248207460
commit f49eb3386b
2 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib.sh
View file

@ -115,23 +115,38 @@ function get_normalized_package_list {
local architecture
architecture=$(dpkg --print-architecture)
local result
local temp_file
temp_file=$(mktemp)
if [ "${architecture}" == "arm64" ]; then
result=$("${script_dir}/apt_query-arm64" normalized-list "${packages}" 2>&1)
"${script_dir}/apt_query-arm64" normalized-list "${packages}" > "${temp_file}" 2>&1
else
result=$("${script_dir}/apt_query-x86" normalized-list "${packages}" 2>&1)
"${script_dir}/apt_query-x86" normalized-list "${packages}" > "${temp_file}" 2>&1
fi
# Check for errors in output
if [ -z "${result}" ] || echo "${result}" | grep -qiE "error|fatal|unable"; then
echo "apt_query failed with output: ${result}" >&2
fi
local exit_code=$?
result=$(cat "${temp_file}")
rm -f "${temp_file}"
echo "original apt-query result: '${result}'" >&2
# Check if the command failed or if output looks like an error message
if [ ${exit_code} -ne 0 ] || [ -z "${result}" ] || echo "${result}" | grep -qiE "^exit status|^error|^fatal|^unable"; then
echo "apt_query failed with exit code ${exit_code}" >&2
echo "Output: ${result}" >&2
# Return empty string to indicate failure
echo ""
return 1
fi
# Remove "Reverse=Provides: " prefix from strings if present
local clean_result
clean_result=$(echo "${result}" | sed 's/Reverse=Provides: //g')
# Debug logging to stderr (won't interfere with return value captured via command substitution)
echo "cleaned apt-query result: '${clean_result}'" >&2
if [[ "${-}" == *x* ]] || [ "${DEBUG:-${debug}}" = "true" ]; then
echo "packages after sed: '${packages}'" >&2
echo "original apt-query result: '${result}'" >&2
echo "cleaned apt-query result: '${clean_result}'" >&2
fi
echo "${clean_result}"
}

7
pre_cache_action.sh
View file

@ -109,6 +109,13 @@ log "Normalizing package list..."
packages="$(get_normalized_package_list "${combined_packages}")"
log "normalized packages: '${packages}'"
# Check if normalization failed (empty result means failure)
if [ -z "${packages}" ]; then
log "aborted"
log "Failed to normalize package list. The apt_query binary may have failed or the packages may be invalid." >&2
exit 4
fi
validate_bool "${execute_install_scripts}" execute_install_scripts 4
# Basic validation for repository parameter