diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-15 03:33:23 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-15 03:33:23 +0000 |
| commit | 34276794ce110cd2f9204e4b504aea41fb584145 (patch) | |
| tree | 614343b8dd17e74468019c46daabd3861ef8dfbc /core/glibc/locale-gen | |
| parent | 86a5624291a8a72d9a0a2c51fcc64bf6e221524b (diff) | |
Sat Feb 15 03:31:19 UTC 2014
Diffstat (limited to 'core/glibc/locale-gen')
| -rwxr-xr-x | core/glibc/locale-gen | 60 |
1 files changed, 23 insertions, 37 deletions
diff --git a/core/glibc/locale-gen b/core/glibc/locale-gen index 51191f810..5aff344c4 100755 --- a/core/glibc/locale-gen +++ b/core/glibc/locale-gen @@ -4,53 +4,39 @@ set -e LOCALEGEN=/etc/locale.gen LOCALES=/usr/share/i18n/locales -unset POSIXLY_CORRECT +if [ -n "$POSIXLY_CORRECT" ]; then + unset POSIXLY_CORRECT +fi -[ -s "$LOCALEGEN" ] || exit 0 + +[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; # Remove all old locale dir and locale-archive before generating new # locale data. -rm -rf /usr/lib/locale/* +rm -rf /usr/lib/locale/* || true umask 022 -gen() { - local locale=$1 - local charset=$2 - local input= - - if [ -z "$locale" ] || [ -z "$charset" ]; then - echo "error: Bad entry '$locale $charset'" - return - fi - - printf ' %s.%s\n' "$(echo "$locale" | sed 's/\([^.\@]*\).*/\1/')" "$charset" - - if [ -f "$LOCALES/$locale" ]; then - input=$locale - else - input=$(echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/') - fi - - localedef -i "$input" -c -f "$charset" -A /usr/share/locale/locale.alias "$locale" +is_entry_ok() { + if [ -n "$locale" -a -n "$charset" ] ; then + true + else + echo "error: Bad entry '$locale $charset'" + false + fi } -maxjobs=$(grep -c processor /proc/cpuinfo 2>/dev/null || echo 1) echo "Generating locales..." while read locale charset; do \ - case $locale in - \#*|'') - continue - ;; - esac - gen "$locale" "$charset" & - - # keep no more than $maxjobs jobs in flight - while [ $(jobs | wc -l) -ge $maxjobs ]; do - sleep 0.25 - jobs >/dev/null - done + case $locale in \#*) continue;; "") continue;; esac; \ + is_entry_ok || continue + echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ + echo -n ".$charset"; \ + echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ + echo -n '...'; \ + if [ -f $LOCALES/$locale ]; then input=$locale; else \ + input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ + localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ + echo ' done'; \ done < $LOCALEGEN -wait - echo "Generation complete." |