From 332dd86912515dda5703127d13fd21f96e8273b9 Mon Sep 17 00:00:00 2001 From: Nezmer Date: Tue, 1 Feb 2011 12:02:50 -0500 Subject: makepkg: Fix the check for references to srcdir/pkgdir At least in FreeBSD, find always returns 0 if it finds stuff (imagine that). It doesn't care about the exit status of whatever is passed to -exec. This patch makes the checks compatible with this behaviour. Using xargs and not using grep directly because packages with too many files would cause grep to complain about argument list being too long. This should also fix the false positive in packages with no files. Signed-off-by: Nezmer Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0a90b89d..a898b5ad 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1000,10 +1000,10 @@ check_package() { done # check for references to the build and package directory - if find "${pkgdir}" -type f -exec grep -q -I "${srcdir}" {} +; then + if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; then warning "$(gettext "Package contains reference to %s")" "\$srcdir" fi - if find "${pkgdir}" -type f -exec grep -q -I "${pkgdir}" {} +; then + if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdir}" ; then warning "$(gettext "Package contains reference to %s")" "\$pkgdir" fi -- cgit v1.2.3-24-g4f1b