diff options
| author | Dan McGee <dan@archlinux.org> | 2010-06-30 15:41:43 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-06-30 15:41:43 +0200 |
| commit | 96a1255eadd8b1faaffbfc2e9bdb1aa5e46ee04c (patch) | |
| tree | 84976f108b049a1f47ed815d1c8156e53bac26f6 /scripts/makepkg.sh.in | |
| parent | c11bf581a33babdbdf7b769567415b1faf1c4219 (diff) | |
| parent | 0ea52e3a4f698ce3b1c90881a2b2eaa56625f261 (diff) | |
| download | pacman-96a1255eadd8b1faaffbfc2e9bdb1aa5e46ee04c.tar.gz pacman-96a1255eadd8b1faaffbfc2e9bdb1aa5e46ee04c.tar.xz | |
Merge branch 'maint'
Diffstat (limited to 'scripts/makepkg.sh.in')
| -rw-r--r-- | scripts/makepkg.sh.in | 6 |
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 |