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

diff --git a/update_unicode.sh b/update_unicode.sh
index c1c876c9406b0b51d322186e6b5dbf5883ddab95..27af77c7df63f8a9039d77b332ebb06d69f02f65 100755 (executable)
--- a/update_unicode.sh
+++ b/update_unicode.sh
@@ -26,13 +26,15 @@ fi &&
                        ./configure --enable-warnings=-Werror CFLAGS='-O0 -ggdb'
                fi &&
                make
-       ) && {
-               echo "static const struct interval zero_width[] = {" &&
-               UNICODE_DIR=. ./uniset/uniset --32 cat:Me,Mn,Cf + U+1160..U+11FF - U+00AD |
-               grep -v plane &&
-               echo "};" &&
-               echo "static const struct interval double_width[] = {" &&
-               UNICODE_DIR=. ./uniset/uniset --32 eaw:F,W &&
-               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
 )