Mercurial > hg > toybox
changeset 293:6baa13382880
Sort was including the trailing comma and getting the order wrong.
(Specifically, it was comparing "sh," with "sha1sum," and putting sha1sum first
in generated/newtoys.h so the binary search wasn't finding sha1sum. Alas, you
can't feed separate beginning and ending delimiters to "sort -t". The fix is
to copy the appropriate field out with sed, duplicate it at the start of the
string where it's easy to compare, and then remove it again with a second
sed after the sort.
author | Rob Landley <rob@landley.net> |
---|---|
date | Mon, 12 May 2008 01:23:19 -0500 |
parents | b4077be6c746 |
children | 3de1ea4d6b56 |
files | scripts/make.sh |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/make.sh Mon May 12 00:52:27 2008 -0500 +++ b/scripts/make.sh Mon May 12 01:23:19 2008 -0500 @@ -22,7 +22,8 @@ done } echo "NEWTOY(toybox, NULL, 0)" > generated/newtoys.h -newtoys | sort -t '(' -k3,3 >> generated/newtoys.h +newtoys | sed 's/\(.*TOY(\)\([^,]*\),\(.*\)/\2 \1\2,\3/' | sort -k 1,1 \ + | sed 's/[^ ]* //' >> generated/newtoys.h # Extract global structure definitions from toys/*.c