--- locale-gen.orig +++ locale-gen @@ -127,25 +127,26 @@ else while [ -n "$1" ]; do if [ -f "$SUPPORTED/$1" ]; then - GENERATE="`cat $SUPPORTED/$1`" + GENERATE="$GENERATE\n`cat $SUPPORTED/$1`" elif [ $IS_LANG = no ] && L=`grep "^${1/%.utf8/.UTF-8} " /usr/share/i18n/SUPPORTED`; then - GENERATE="$L" - add_to_locale_gen "$GENERATE" + GENERATE="$GENERATE\n$L" + add_to_locale_gen "$L" else # try to come up with a sensible default - GENERATE=`grep -E "^${1}( |[._@][^[:space:]]* )UTF-8" /usr/share/i18n/SUPPORTED` - if [ -z "$GENERATE" ]; then + TRY=`grep -E "^${1}( |[._@][^[:space:]]* )UTF-8" /usr/share/i18n/SUPPORTED || true` + if [ -z "$TRY" ]; then echo "Error: '$1' is not a supported language or locale" >&2 exit 1 fi - add_to_locale_gen "$GENERATE" + GENERATE="$GENERATE\n$TRY" + add_to_locale_gen "$TRY" fi shift done fi echo "Generating locales (this might take a while)..." -echo "$GENERATE" | sort -u | while read locale charset; do \ +echo -e "$GENERATE" | sort -u | while read locale charset; do \ case $locale in \#*) continue;; "") continue;; esac; \ is_entry_ok || continue if [ "$KEEP" ] && PERL_BADLANG=0 perl -MPOSIX -e \