summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'locale-gen')
-rwxr-xr-xlocale-gen8
1 files changed, 6 insertions, 2 deletions
diff --git a/locale-gen b/locale-gen
index fc861f4..f88c677 100755
--- a/locale-gen
+++ b/locale-gen
@@ -181,6 +181,10 @@ if [[ -z ${locales_to_generate} ]] && [[ -e ${CONFIG} ]] ; then
ewarn "Some might be filtered, but you must fix it."
locales_to_generate=$(echo "${locales_to_generate}" | uniq)
fi
+
+ if echo ${locales_to_generate} | grep -vq 'C.UTF-8' ; then
+ locales_to_generate=$(echo "${locales_to_generate}" ; echo "C.UTF-8 UTF-8")
+ fi
fi
if [[ -z ${locales_to_generate} ]] ; then
@@ -339,7 +343,7 @@ ret=$(( 0 ${JOB_RETS[@]/#/+} ))
[[ ${QUIET} -eq 0 ]] && [[ -z ${JUST_LIST} ]] && \
einfo "Generation complete"
-if ${LOCALE_ARCHIVE} ; then
+if ${LOCALE_ARCHIVE} && [[ -z ${JUST_LIST} ]] ; then
ebegin "Adding locales to archive"
# The pattern ends with / on purpose: we don't care about files (like
# locale-archive) in the locale subdir, and we definitely don't want to
@@ -367,7 +371,7 @@ if ${LOCALE_ARCHIVE} ; then
fi
# Remove locales that existed but were not requested
-if [[ -n ${UPDATE} ]] ; then
+if [[ -n ${UPDATE} ]] && [[ -z ${JUST_LIST} ]] ; then
# Ignore these pseudo locales
existing_locales=${existing_locales/ C / }
existing_locales=${existing_locales/ POSIX / }