diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2019-10-27 08:41:46 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2019-10-30 01:03:46 +0100 |
| commit | 0272fca993718460bf7ecb7fdc3ca7dad1c7e6cd (patch) | |
| tree | fdc652bd645eb30352aaddb7f956a4e19bf94c31 /scripts/makepkg.sh.in | |
| parent | a745d97c174ef1d85649b2a8ad7ca22e3dea9e58 (diff) | |
| download | pacman-0272fca993718460bf7ecb7fdc3ca7dad1c7e6cd.tar.gz pacman-0272fca993718460bf7ecb7fdc3ca7dad1c7e6cd.tar.xz | |
makepkg: do not count hard links multiple times when calculating pkg size
Exclude files with hardlinks when cat'ing all the files, and do a second
run to look at each file with hardlinks, keep track of the ones we've
already operated on, and only cat each inode once. Then use "wc -c" to get
the size of all (deduplicated) files the same way we were already doing.
Original-patch-by: Ronan Pigott <rpigott@berkeley.edu>
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts/makepkg.sh.in')
| -rw-r--r-- | scripts/makepkg.sh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 947a30c5..d217d0a4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -584,7 +584,7 @@ write_kv_pair() { } write_pkginfo() { - local size="$(find . -type f -exec cat {} + 2>/dev/null | wc -c)" + local size=$(dirsize) merge_arch_attrs |