@@ -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 \
new file mode 100644
@@ -0,0 +1,39 @@
+#!/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
+
+LIBRARY=${LIBRARY:-'/usr/share/makepkg'}
+
+
+dirsize() {
+ local size=0 s file files inode
+
+ while read -rd ' ' inode; do
+ read file
+ if [[ -z ${files[$inode]} ]]; then
+ files[$inode]=$file
+ size=$(( size + $(cat $file | wc -c) ))
+ fi
+ done < <(find . -type f -exec @INODECMD@ '{}' + 2>/dev/null)
+
+ echo $size
+}
@@ -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
Keeps track of file inodes that we have already counted using the same strategy as we do for zipman. Still uses "cat | wc -c" to calculate file sizes as it is the only thing guaranteed to be consistent. Signed-off-by: Allan McRae <allan@archlinux.org> --- scripts/Makefile.am | 1 + scripts/libmakepkg/util/dirsize.sh.in | 39 +++++++++++++++++++++++++++ scripts/libmakepkg/util/meson.build | 1 + scripts/makepkg.sh.in | 2 +- 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 scripts/libmakepkg/util/dirsize.sh.in