diff options
| author | Xavier Chantry <shiningxc@gmail.com> | 2008-05-26 23:46:01 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-05-29 13:37:14 +0200 |
| commit | 149839c5391e9a93465f86dbb8d095a0150d755d (patch) | |
| tree | 71b23a3042f360f8c935ee3befc49150a055f972 | |
| parent | 1d71079c5b57af2feb53fbfa98f93122a32ca154 (diff) | |
| download | pacman-149839c5391e9a93465f86dbb8d095a0150d755d.tar.gz pacman-149839c5391e9a93465f86dbb8d095a0150d755d.tar.xz | |
du -b is not available on BSD, use du -k instead.
This fixes FS#10459.
There is apparently no portable ways to get the apparent size of a file,
like du -b does. So the best compromise seems to get the block size in kB,
and then convert that to byte so that we keep compatibility.
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 2 | ||||
| -rw-r--r-- | scripts/repo-add.sh.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 273bc0ab..9587756a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -779,7 +779,7 @@ create_package() { else local packager="Unknown Packager" fi - local size=$(du -sb | awk '{print $1}') + local size=$(du -sk | awk '{print $1 * 1024}') # write the .PKGINFO file msg2 "$(gettext "Generating .PKGINFO file...")" diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 21031547..e90f0e89 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -118,7 +118,7 @@ db_write_delta() # get md5sum and size of delta md5sum="$(md5sum "$deltafile" | cut -d ' ' -f 1)" - csize=$(du -b -L "$deltafile" | cut -f 1) + csize=$(du -kL "$deltafile" | awk '{print $1 * 1024}') # ensure variables were found if [ -z "$pkgname" -o -z "$fromver" -o -z "$tover" -o -z "$arch" ]; then @@ -165,7 +165,7 @@ db_write_entry() IFS=$OLDIFS # get compressed size of package - csize=$(du -b -L "$pkgfile" | cut -f 1) + csize=$(du -kL "$pkgfile" | awk '{print $1 * 1024}') startdir=$(pwd) pushd "$gstmpdir" 2>&1 >/dev/null |