Martchus
/
devtools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

common: implement validity as a function 

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
This commit is contained in:
Morten Linderud 2021-12-25 15:01:15 +01:00 committed by Levente Polyak
parent fa5afbc30b
commit ec16d6e4bd
No known key found for this signature in database
GPG Key ID: FC1B547C8D8172C8
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
commitpkg.in
View File

@ -93,14 +93,7 @@ for _arch in "${arch[@]}"; do
fullver=$(get_full_version "$_pkgname")
if pkgfile=$(find_cached_package "$_pkgname" "$fullver" "$_arch"); then
if grep -q "packager = Unknown Packager" <(bsdtar -xOqf "$pkgfile" .PKGINFO); then
die "PACKAGER was not set when building package"
fi
hashsum=sha256sum
pkgbuild_hash=$(awk -v"hashsum=$hashsum" -F' = ' '$1 == "pkgbuild_"hashsum {print $2}' <(bsdtar -xOqf "$pkgfile" .BUILDINFO))
if [[ "$pkgbuild_hash" != "$($hashsum PKGBUILD|cut -d' ' -f1)" ]]; then
die "PKGBUILD $hashsum mismatch: expected $pkgbuild_hash"
fi
check_package_validity "$pkgfile"
fi
done
done

13
lib/common.sh
View File

@ -189,3 +189,16 @@ find_cached_package() {
return 1
esac
}
check_package_validity(){
local pkgfile=$1
if grep -q "packager = Unknown Packager" <(bsdtar -xOqf "$pkgfile" .PKGINFO); then
die "PACKAGER was not set when building package"
fi
hashsum=sha256sum
pkgbuild_hash=$(awk -v"hashsum=$hashsum" -F' = ' '$1 == "pkgbuild_"hashsum {print $2}' <(bsdtar -xOqf "$pkgfile" .BUILDINFO))
if [[ "$pkgbuild_hash" != "$($hashsum PKGBUILD|cut -d' ' -f1)" ]]; then
die "PKGBUILD $hashsum mismatch: expected $pkgbuild_hash"
fi
}