kiss-community/kiss
1
0
Fork 1
mirror of https://codeberg.org/kiss-community/kiss synced 2024-12-25 00:20:05 -07:00
Code Issues Wiki

kiss: simplify pkg_verify

Browse Source
This commit is contained in:
Dylan Araps 2020-09-14 21:05:57 +03:00
parent 5d428ce24c
commit 4cde4248cb
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
kiss
View File

@ -584,7 +584,7 @@ pkg_build() {
done done
for pkg do pkg_sources "$pkg"; done for pkg do pkg_sources "$pkg"; done
pkg_verify "$@" for pkg do pkg_verify "$pkg"; done
# Finally build and create tarballs for all passed packages and # Finally build and create tarballs for all passed packages and
# dependencies. # dependencies.
@ -695,35 +695,23 @@ pkg_checksums() {
pkg_verify() { pkg_verify() {
# Verify all package checksums. This is achieved by generating a new set # Verify all package checksums. This is achieved by generating a new set
# of checksums and then comparing those with the old set. # of checksums and then comparing those with the old set.
verify_cmd="NR==FNR{a[\$1];next}/^git .*/{next}!((\$1)in a){exit 1}" pkg_find "$pkg"
for pkg do [ -f "$repo_dir/sources" ] ||
pkg_find "$pkg" return 0
[ -f "$repo_dir/sources" ] || continue sum_sys=$(pkg_checksums "$pkg")
verify_sum=$(pkg_checksums "$pkg") [ "$sum_sys" ] ||
return 0
[ "$verify_sum" ] || continue [ -f "$repo_dir/checksums" ] ||
[ -f "$repo_dir/checksums" ] || die "$pkg" "checksums file missing" die "$pkg" "checksums file missing"
# Check that the first column (separated by whitespace) match in both sum_pkg=$(cut -b 1-64 < "$repo_dir/checksums")
# checksum files. If any part of either file differs, mismatch. Abort.
printf '%s\n' "$verify_sum" |
awk "$verify_cmd" - "$repo_dir/checksums" || { [ "$sum_sys" = "$sum_pkg" ] ||
log "$pkg" "Checksum mismatch" die "$pkg" "Checksum mismatch"
# Instead of dying above, log it to the terminal. Also define a
# variable so we *can* die after all checksum files have been
# checked.
mismatch="$mismatch$pkg "
}
done
[ -z "$mismatch" ] || die "Checksum mismatch with: ${mismatch% }"
log "Verified all checksums"
} }
pkg_conflicts() { pkg_conflicts() {