update_unicode.sh: remove an unnecessary subshell level
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>
Beat Bolli committed
Dec 14, 2016 at 00:31 UTC
b79e28e3701e83ba19d3b11ada4cc2bbdfaf8c29
1 file changed
+26
-27
contrib/update-unicode/update_unicode.sh
+26
-27
@@ -7,32 +7,31 @@
7
#
8
cd "$(dirname "$0")"
9
UNICODEWIDTH_H=$(git rev-parse --show-toplevel)/unicode_width.h
10
+
11
+if ! test -f UnicodeData.txt; then
12
+ wget http://www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt
13
+fi &&
14
+if ! test -f EastAsianWidth.txt; then
15
+ wget http://www.unicode.org/Public/UCD/latest/ucd/EastAsianWidth.txt
16
+fi &&
17
+if ! test -d uniset; then
18
+ git clone https://github.com/depp/uniset.git
19
+fi &&
20
(
11
- if ! test -f UnicodeData.txt; then
12
- wget http://www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt
21
+ cd uniset &&
22
+ if ! test -x uniset; then
23
+ autoreconf -i &&
24
+ ./configure --enable-warnings=-Werror CFLAGS='-O0 -ggdb'
25
fi &&
14
- if ! test -f EastAsianWidth.txt; then
15
- wget http://www.unicode.org/Public/UCD/latest/ucd/EastAsianWidth.txt
16
- fi &&
17
- if ! test -d uniset; then
18
- git clone https://github.com/depp/uniset.git
19
- fi &&
20
- (
21
- cd uniset &&
22
- if ! test -x uniset; then
23
- autoreconf -i &&
24
- ./configure --enable-warnings=-Werror CFLAGS='-O0 -ggdb'
25
- fi &&
26
- make
27
- ) &&
28
- UNICODE_DIR=. && export UNICODE_DIR &&
29
- cat >$UNICODEWIDTH_H <<-EOF
30
- static const struct interval zero_width[] = {
31
- $(uniset/uniset --32 cat:Me,Mn,Cf + U+1160..U+11FF - U+00AD |
32
- grep -v plane)
33
- };
34
- static const struct interval double_width[] = {
35
- $(uniset/uniset --32 eaw:F,W)
36
- };
37
- EOF
38
-)
26
+ make
27
+) &&
28
+UNICODE_DIR=. && export UNICODE_DIR &&
29
+cat >$UNICODEWIDTH_H <<-EOF
30
+static const struct interval zero_width[] = {
31
+ $(uniset/uniset --32 cat:Me,Mn,Cf + U+1160..U+11FF - U+00AD |
32
+ grep -v plane)
33
+};
34
+static const struct interval double_width[] = {
35
+ $(uniset/uniset --32 eaw:F,W)
36
+};
37
+EOF