summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2010-06-30 13:29:26 +1000
committerDan McGee <dan@archlinux.org>2010-06-30 08:27:29 -0500
commit0ea52e3a4f698ce3b1c90881a2b2eaa56625f261 (patch)
tree5512abce4be98990da7bc0c6467ac4200d5e3868
parent8b23aa172f6229dd82c381704d4802d9747e118b (diff)
downloadpacman-0ea52e3a4f698ce3b1c90881a2b2eaa56625f261.tar.xz
makepkg: try standard paths for coreutils du
Attempt to find "du" from coreutils in the standard paths and if not revert to the version in the users PATH. Using the full path prevents issues such as FS#19932, where a different and incompatible version of du is put earlier in the users path. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--configure.ac1
-rw-r--r--scripts/Makefile.am1
-rw-r--r--scripts/makepkg.sh.in2
3 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 4faf20d9..7d4e60f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,6 +210,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 330acb98..0fde3345 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -42,6 +42,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|@configure_input[@]|Generated from $@.in; do not edit by hand.|g'
## All the scripts depend on Makefile so that they are rebuilt when the
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 6ad83f0b..f3c72172 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -902,7 +902,7 @@ write_pkginfo() {
else
local packager="Unknown Packager"
fi
- local size="$(du -sk)"
+ local size="$(@DUPATH@ -sk)"
size="$(( ${size%%[^0-9]*} * 1024 ))"
msg2 "$(gettext "Generating .PKGINFO file...")"