From dd9570eeac0ecd232604de93ff3118b2ce322be2 Mon Sep 17 00:00:00 2001 From: Manuel Schneider Date: Tue, 1 Oct 2013 14:20:22 +0200 Subject: [german] Fix locale generation on ubuntu --- remote/modules/german/german.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/remote/modules/german/german.build b/remote/modules/german/german.build index c8795254..cd68f009 100644 --- a/remote/modules/german/german.build +++ b/remote/modules/german/german.build @@ -10,10 +10,10 @@ build() { locale-gen || perror "Could not generate locales (debian style)" fi # Ubuntu's version - if [ -d "/var/lib/locales/supported.d" ] && ! grep -q -E -r '^\s*de_DE\.UTF-8' "/var/lib/locales/supported.d"; then + if [ -d "/var/lib/locales/supported.d" ] && [ ! -d /usr/lib/locale/de_DE.utf8 ]; then pinfo "Generating locales..." - echo 'de_DE.UTF-8 UTF-8' >> "/var/lib/locales/supported.d/openslx" - locale-gen "de_DE.UTF-8" || perror "Could not generate locales (ubuntu style)" + grep -q -E -r '^\s*de_DE\.UTF-8' "/var/lib/locales/supported.d" || echo 'de_DE.UTF-8 UTF-8' >> "/var/lib/locales/supported.d/openslx" + locale-gen --no-archive --purge "de_DE.UTF-8" || perror "Could not generate locales (ubuntu style)" fi # Put everything we build or get from the system in build dir -- cgit v1.2.3-55-g7522