Merge branch 'jh/pre-push-sample-no-custom-ifs'

diff --git a/update_unicode.sh b/update_unicode.sh
index 000b937e6828d378829cfe8a25e93ce07c531574..27af77c7df63f8a9039d77b332ebb06d69f02f65 100755 (executable)
--- 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
 )