Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16876:d252b31de6ab
announce-gen: du -h is more portable than du --human
* build-aux/announce-gen (sizes): Invoke du with -h instead
of --human. Accept leading white space in its output.
These changes are required to accommodate OS/X's du.
| author | Akim Demaille <akim@lrde.epita.fr> |
|---|---|
| date | Wed, 23 May 2012 09:47:48 +0200 |
| parents | 4d9281e52998 |
| children | c01778431ed2 |
| files | ChangeLog build-aux/announce-gen |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-05-23 Akim Demaille <akim@lrde.epita.fr> + + announce-gen: du -h is more portable than du --human + * build-aux/announce-gen (sizes): Invoke du with -h instead + of --human. Accept leading white space in its output. + 2012-05-23 Akim Demaille <akim@lrde.epita.fr> announce-gen: Improve diagnostics.
--- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -103,13 +103,13 @@ my %res; foreach my $f (@file) { - my $cmd = "du --human $f"; + my $cmd = "du -h $f"; my $t = `$cmd`; # FIXME-someday: give a better diagnostic, a la $PROCESS_STATUS $@ and (warn "command failed: '$cmd'\n"), $fail = 1; chomp $t; - $t =~ s/^([\d.]+[MkK]).*/${1}B/; + $t =~ s/^\s*([\d.]+[MkK]).*/${1}B/; $res{$f} = $t; } return $fail ? undef : %res;