Commit 0272fca9 authored by Eli Schwartz's avatar Eli Schwartz Committed by Allan McRae
Browse files

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: default avatarRonan Pigott <rpigott@berkeley.edu>
Signed-off-by: Eli Schwartz's avatarEli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae's avatarAllan McRae <allan@archlinux.org>
parent a745d97c
......@@ -127,6 +127,7 @@ LIBMAKEPKG_IN = \
libmakepkg/util.sh \
libmakepkg/util/compress.sh \
libmakepkg/util/config.sh \
libmakepkg/util/dirsize.sh \
libmakepkg/util/error.sh \
libmakepkg/util/message.sh \
libmakepkg/util/option.sh \
......
#!/usr/bin/bash
#
# dirsize.sh - calculate size of all files in a directory
#
# Copyright (c) 2019 Pacman Development Team <pacman-dev@archlinux.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
[[ -n "$LIBMAKEPKG_UTIL_DIRSIZE_SH" ]] && return
LIBMAKEPKG_UTIL_DIRSIZE_SH=1
# find the total filesize of all files in the current directory while only
# counting multiply hardlinked files once
dirsize() {
local file inode
declare -A files
{
find . -type f -links 1 -exec cat {} + 2>/dev/null
while read -rd ' ' inode; do
IFS= read -r file
if [[ -z ${files[$inode]} ]]; then
files[$inode]=found
cat "$file"
fi
done < <(find . -type f -links +1 -exec @INODECMD@ {} + 2>/dev/null)
} | wc -c
}
......@@ -3,6 +3,7 @@ libmakepkg_module = 'util'
sources = [
'compress.sh.in',
'config.sh.in',
'dirsize.sh.in'
'error.sh.in',
'message.sh.in',
'option.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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment