diff options
| author | Eli Schwartz | 2018-03-16 18:10:43 -0400 |
|---|---|---|
| committer | Eli Schwartz | 2018-03-16 18:10:43 -0400 |
| commit | 87518c5e40a34bea517f1e2bb576860f7ecf31ba (patch) | |
| tree | 88286f1028f263dfc1a5e8d2e10d659e6164d544 | |
| parent | c63f732de65a9cec95709a0124ebe97102897d3d (diff) | |
| download | aur-87518c5e40a34bea517f1e2bb576860f7ecf31ba.tar.gz | |
upgpkg: glibc-git 2.27.r209.gc553cd6f7e-1
updated locale-gen from earnestly
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | locale-gen | 31 |
3 files changed, 24 insertions, 17 deletions
@@ -1,6 +1,6 @@ pkgbase = glibc-git pkgdesc = GNU C Library, from git - pkgver = 2.26.r1049.g3e3c904dae + pkgver = 2.27.r209.gc553cd6f7e pkgrel = 1 url = https://www.gnu.org/software/libc/ install = glibc-git.install @@ -14,7 +14,7 @@ pkgbase = glibc-git depends = tzdata depends = filesystem optdepends = gd: graph image generation with memusage - provides = glibc=2.26 + provides = glibc=2.27 conflicts = glibc options = !strip options = staticlibs @@ -24,7 +24,7 @@ pkgbase = glibc-git source = locale-gen source = bz20338.patch sha256sums = SKIP - sha256sums = cdbd47144b319b0b0eca8d0488dc5173bf24158ab888340920ffe6c3d252dfa6 + sha256sums = 05fbb88877cdddc99ef25e48304d6e5ac236660c20925d461cb4e90ebcb3b7de sha256sums = 959d4f41edd004bddd9091c4d8c8c3aa07d79a04bfdb89d59f9f26fe5a74d32a pkgname = glibc-git @@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=glibc-git -pkgver=2.26.r1049.g3e3c904dae +pkgver=2.27.r209.gc553cd6f7e pkgrel=1 pkgdesc='GNU C Library, from git' arch=('i686' 'x86_64') @@ -24,7 +24,7 @@ source=('git+https://sourceware.org/git/glibc.git' 'locale-gen' 'bz20338.patch') sha256sums=('SKIP' - 'cdbd47144b319b0b0eca8d0488dc5173bf24158ab888340920ffe6c3d252dfa6' + '05fbb88877cdddc99ef25e48304d6e5ac236660c20925d461cb4e90ebcb3b7de' '959d4f41edd004bddd9091c4d8c8c3aa07d79a04bfdb89d59f9f26fe5a74d32a') pkgver() { diff --git a/locale-gen b/locale-gen index c9b65c448ad7..de48ddf8d501 100644 --- a/locale-gen +++ b/locale-gen @@ -6,20 +6,27 @@ if [ ! -d /etc/locales ]; then exit 1 fi -for locale in /etc/locales/*; do - if [ -f "$locale" ]; then - read -r charset < "$locale" - charset=${charset:-UTF-8} - locale=${locale##*/} - else - continue - fi +localegen() { + printf '%s: generating locale\n' "$1"."$2" >&2 - printf '%s: generating locale\n' "$locale"."$charset" >&2 - - localedef -i "$locale" -f "$charset" -c "$locale"."$charset" + localedef -i "$1" -f "$2" -c "$1"."$2" case $? in - 4) printf '%s: invalid locale\n' "$locale"."$charset" >&2 + 4) printf '%s: invalid locale\n' "$1"."$2" >&2 esac +} + +for locale in /etc/locales/*; do + if [ -f "$locale" ]; then + if [ -s "$locale" ]; then + while read -r charset; do + + # This will run for empty lines. Doing this means we can + # ensure at least a UTF-8 based locale is generated. + localegen "${locale##*/}" "${charset:-UTF-8}" + done < "$locale" + else + localegen "${locale##*/}" UTF-8 + fi + fi done |