makepkg: Fix integrity check when files are missing.
The index in the for loop wasn't being incremented, so if the first file wasn't found, the second file would be compared to the first checksum, rather than the second. Signed-off-by: Loui Chang <louipc.ist@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
63fc93607b
commit
52d184dae8
1 changed files with 11 additions and 8 deletions
|
@ -573,6 +573,7 @@ check_checksums() {
|
|||
local idx=0
|
||||
local file
|
||||
for file in "${source[@]}"; do
|
||||
local found=1
|
||||
file="$(get_filename "$file")"
|
||||
echo -n " $file ... " >&2
|
||||
|
||||
|
@ -580,12 +581,13 @@ check_checksums() {
|
|||
if [ ! -f "$file" ] ; then
|
||||
echo "$(gettext "NOT FOUND")" >&2
|
||||
errors=1
|
||||
continue
|
||||
found=0
|
||||
else
|
||||
file="$SRCDEST/$file"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ $found -gt 0 ] ; then
|
||||
local expectedsum="$(echo ${integrity_sums[$idx]} | tr '[A-F]' '[a-f]')"
|
||||
local realsum="$(openssl dgst -${integ} "$file" | awk '{print $NF}')"
|
||||
if [ "$expectedsum" = "$realsum" ]; then
|
||||
|
@ -594,6 +596,7 @@ check_checksums() {
|
|||
echo "$(gettext "FAILED")" >&2
|
||||
errors=1
|
||||
fi
|
||||
fi
|
||||
|
||||
idx=$((idx + 1))
|
||||
done
|
||||
|
|
Loading…
Add table
Reference in a new issue