summaryrefslogtreecommitdiffstats
path: root/remote
diff options
context:
space:
mode:
authorManuel Schneider2013-10-01 14:20:22 +0200
committerManuel Schneider2013-10-01 14:20:22 +0200
commitdd9570eeac0ecd232604de93ff3118b2ce322be2 (patch)
treec9e5a3198f867fad3f5e3a1009a950a3b5d8183f /remote
parentremove wrong commit (diff)
downloadtm-scripts-dd9570eeac0ecd232604de93ff3118b2ce322be2.tar.gz
tm-scripts-dd9570eeac0ecd232604de93ff3118b2ce322be2.tar.xz
tm-scripts-dd9570eeac0ecd232604de93ff3118b2ce322be2.zip
[german] Fix locale generation on ubuntu
Diffstat (limited to 'remote')
-rw-r--r--remote/modules/german/german.build6
1 files 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