Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts/makepkg.sh.in
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-06-30 08:41:43 -0500
committerDan McGee <dan@archlinux.org>2010-06-30 08:41:43 -0500
commit96a1255eadd8b1faaffbfc2e9bdb1aa5e46ee04c (patch)
tree84976f108b049a1f47ed815d1c8156e53bac26f6 /scripts/makepkg.sh.in
parentc11bf581a33babdbdf7b769567415b1faf1c4219 (diff)
parent0ea52e3a4f698ce3b1c90881a2b2eaa56625f261 (diff)
Merge branch 'maint'
Diffstat (limited to 'scripts/makepkg.sh.in')
-rw-r--r--scripts/makepkg.sh.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index fdedc89b..e16b54e5 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -906,7 +906,7 @@ write_pkginfo() {
else
local packager="Unknown Packager"
fi
- local size="$(du -sk)"
+ local size="$(@DUPATH@ -sk)"
size="$(( ${size%%[^0-9]*} * 1024 ))"
msg2 "$(gettext "Generating .PKGINFO file...")"
@@ -968,7 +968,7 @@ check_package() {
done
# check for references to the build directory
- if grep -R "${srcdir}" "${pkgdir}" &>/dev/null; then
+ if find "${pkgdir}" -type f -exec grep -q "${srcdir}" {} +; then
warning "$(gettext "Package contains reference to %s")" "\$srcdir"
fi
}
@@ -1243,7 +1243,7 @@ check_sanity() {
# evaluate any bash variables used
eval file=${file}
if [[ ! -f $file ]]; then
- error "$(gettext "%s file (%s) does not exist.")" "${i^}" "$file"
+ error "$(gettext "%s file (%s) does not exist.")" "$i" "$file"
return 1
fi
done