aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-07 13:09:04 -0800
committerJunio C Hamano <gitster@pobox.com>2015-01-07 13:09:04 -0800
commitc0cf6866fc2541239cfbfae238f591c2c0fe75a7 (patch)
treeb234b95f750befec5f8b1693cfb710bf67c4229e
parent74a101eb48b72fad372cfa15669a3b6c55fb1046 (diff)
parent32c239d1fb23d47aa95cc8a47f99dc25f152021d (diff)
downloadgit-c0cf6866fc2541239cfbfae238f591c2c0fe75a7.tar.gz
git-c0cf6866fc2541239cfbfae238f591c2c0fe75a7.tar.xz
Merge branch 'bb/update-unicode-table'
Simplify the procedure to generate unicode table. * bb/update-unicode-table: update_unicode.sh: delete the command group update_unicode.sh: make the output structure visible update_unicode.sh: shorten uniset invocation path update_unicode.sh: set UNICODE_DIR only once update_unicode.sh: simplify output capture
-rwxr-xr-xupdate_unicode.sh17
1 files changed, 10 insertions, 7 deletions
diff --git a/update_unicode.sh b/update_unicode.sh
index 000b937e6..27af77c7d 100755
--- a/update_unicode.sh
+++ b/update_unicode.sh
@@ -27,11 +27,14 @@ fi &&
fi &&
make
) &&
- echo "static const struct interval zero_width[] = {" >$UNICODEWIDTH_H &&
- UNICODE_DIR=. ./uniset/uniset --32 cat:Me,Mn,Cf + U+1160..U+11FF - U+00AD |
- grep -v plane >>$UNICODEWIDTH_H &&
- echo "};" >>$UNICODEWIDTH_H &&
- echo "static const struct interval double_width[] = {" >>$UNICODEWIDTH_H &&
- UNICODE_DIR=. ./uniset/uniset --32 eaw:F,W >>$UNICODEWIDTH_H &&
- echo "};" >>$UNICODEWIDTH_H
+ UNICODE_DIR=. && export UNICODE_DIR &&
+ cat >$UNICODEWIDTH_H <<-EOF
+ static const struct interval zero_width[] = {
+ $(uniset/uniset --32 cat:Me,Mn,Cf + U+1160..U+11FF - U+00AD |
+ grep -v plane)
+ };
+ static const struct interval double_width[] = {
+ $(uniset/uniset --32 eaw:F,W)
+ };
+ EOF
)