commitpkg: Sync changelog/install check with makepkg(8)

makepkg(8) currently uses a smarter method to extract all changelog and
install files from a PKGBUILD. Sync commitpkg to use the same code (with
small modifications). This also adds support for changelog/install files
that contain a whitespace.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
This commit is contained in:
Lukas Fleischer 2011-10-24 20:15:22 +02:00 committed by Pierre Schmitz
parent 521c4ceec3
commit bea69043fb
1 changed files with 3 additions and 4 deletions

View File

@ -86,14 +86,13 @@ done
# check if changelog and install files are under version control
for i in 'changelog' 'install'; do
filelist=$(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD)
for file in $filelist; do
while read -r file; do
# evaluate any bash variables used
eval file=${file}
eval file=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$file")\"
if ! svn status -v "${file}" | grep -q '^[ AMRX~]'; then
abort "${file} is not under version control"
fi
done
done < <(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD)
done
# see if any limit options were passed, we'll send them to rsync