mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update_unicode.sh: remove an unnecessary subshell level

Browse Source 
After the move into contrib/update-unicode, we no longer create the
unicode directory to have a clean working folder. Instead, the directory
of the script is used. This means that the subshell can be removed.

Signed-off-by: Beat Bolli <dev+git@drbeat.li>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Beat Bolli 2016-12-14 00:31:40 +01:00 committed by Junio C Hamano
parent f3eb54920e
commit b79e28e370
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
contrib/update-unicode/update_unicode.sh
View File

@ -7,32 +7,31 @@
# #
cd "$(dirname "$0")" cd "$(dirname "$0")"
UNICODEWIDTH_H=$(git rev-parse --show-toplevel)/unicode_width.h UNICODEWIDTH_H=$(git rev-parse --show-toplevel)/unicode_width.h
(
if ! test -f UnicodeData.txt; then if ! test -f UnicodeData.txt; then
wget http://www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt wget http://www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt
fi && fi &&
if ! test -f EastAsianWidth.txt; then if ! test -f EastAsianWidth.txt; then
wget http://www.unicode.org/Public/UCD/latest/ucd/EastAsianWidth.txt wget http://www.unicode.org/Public/UCD/latest/ucd/EastAsianWidth.txt
fi && fi &&
if ! test -d uniset; then if ! test -d uniset; then
git clone https://github.com/depp/uniset.git git clone https://github.com/depp/uniset.git
fi && fi &&
( (
cd uniset && cd uniset &&
if ! test -x uniset; then if ! test -x uniset; then
autoreconf -i && autoreconf -i &&
./configure --enable-warnings=-Werror CFLAGS='-O0 -ggdb' ./configure --enable-warnings=-Werror CFLAGS='-O0 -ggdb'
fi && fi &&
make make
) && ) &&
UNICODE_DIR=. && export UNICODE_DIR && UNICODE_DIR=. && export UNICODE_DIR &&
cat >$UNICODEWIDTH_H <<-EOF cat >$UNICODEWIDTH_H <<-EOF
static const struct interval zero_width[] = { static const struct interval zero_width[] = {
$(uniset/uniset --32 cat:Me,Mn,Cf + U+1160..U+11FF - U+00AD | $(uniset/uniset --32 cat:Me,Mn,Cf + U+1160..U+11FF - U+00AD |
grep -v plane) grep -v plane)
}; };
static const struct interval double_width[] = { static const struct interval double_width[] = {
$(uniset/uniset --32 eaw:F,W) $(uniset/uniset --32 eaw:F,W)
}; };
EOF EOF
)