From 3f1ea8b62f46a915c94a5b46e21ad39ea2628f65 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 7 Apr 2012 11:20:08 -0500 Subject: Revert "makepkg: calculate exact total file size" This reverts commit b264fb9e9ddcc31dc8782390309421965e507383. With our "fix" of sleeping for BTRFS, we can go back to using `du` to calculate total installed size. --- configure.ac | 1 + scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 12a6e65e..52f8ad44 100644 --- a/configure.ac +++ b/configure.ac @@ -282,6 +282,7 @@ esac AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes") AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") +AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] ) AC_SUBST(SIZECMD) AC_SUBST(SEDINPLACE) AC_SUBST(STRIP_BINARIES) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 727de258..328fbff2 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -53,6 +53,7 @@ edit = sed \ -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ + -e 's|@DUPATH[@]|$(DUPATH)|g' \ -e 's|@SCRIPTNAME[@]|$@|g' \ -e 's|@configure_input[@]|Generated from $@.sh.in; do not edit by hand.|g' diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index eb1329c7..12cda8ce 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1156,7 +1156,8 @@ write_pkginfo() { else local packager="Unknown Packager" fi - local size="$(find . -print0 | xargs -0 @SIZECMD@ | awk '{ sum += $1 } END { print sum }')" + local size="$(@DUPATH@ -sk)" + size="$(( ${size%%[^0-9]*} * 1024 ))" msg2 "$(gettext "Generating %s file...")" ".PKGINFO" echo "# Generated by makepkg $myver" -- cgit v1.2.3