diff options
| author | Dan McGee <dan@archlinux.org> | 2012-04-07 11:20:08 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-04-07 11:20:08 -0500 |
| commit | 3f1ea8b62f46a915c94a5b46e21ad39ea2628f65 (patch) | |
| tree | b54c71ab10ea90dc054a4b6c63aac5c05bb03c8d | |
| parent | 0145604728360acaf56e6d50bc03e78bfab7585c (diff) | |
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.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | scripts/Makefile.am | 1 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 3 |
3 files changed, 4 insertions, 1 deletions
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" |