From ce6636b06b67d6bb9b3d6927bf2a926b9b7478f5 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Mon, 1 Jan 2018 15:33:50 +0100 Subject: Improve gen-locales.mk and gen-locale.sh to make test files with @ options work With out this, adding collation test files like localedata/gez_ER.UTF-8@abegede.in does not work for locales which contain @ modifiers. * gen-locales.mk: Make test files which contain @ modifiers in their name work. * localedata/gen-locale.sh: Likewise. --- localedata/gen-locale.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'localedata') diff --git a/localedata/gen-locale.sh b/localedata/gen-locale.sh index 1bba5fe..b91e42a 100644 --- a/localedata/gen-locale.sh +++ b/localedata/gen-locale.sh @@ -49,7 +49,8 @@ generate_locale () locfile=`echo $locfile|sed 's|.*/\([^/]*/LC_CTYPE\)|\1|'` locale=`echo $locfile|sed 's|\([^.]*\)[.].*/LC_CTYPE|\1|'` -charmap=`echo $locfile|sed 's|[^.]*[.]\(.*\)/LC_CTYPE|\1|'` +charmap=`echo $locfile|sed 's|[^.]*[.]\([^@ ]*\)\(@[^ ]*\)\?/LC_CTYPE|\1|'` +modifier=`echo $locfile|sed 's|[^.]*[.]\([^@ ]*\)\(@[^ ]*\)\?/LC_CTYPE|\2|'` echo "Generating locale $locale.$charmap: this might take a while..." @@ -73,4 +74,4 @@ if [ "$charmap_real" = 'SHIFT_JIS' ] \ flags="$flags --no-warnings=ascii" fi -generate_locale $charmap_real $locale $locale.$charmap "$flags" +generate_locale $charmap_real $locale$modifier $locale.$charmap$modifier "$flags" -- cgit v1.1