diff options
Diffstat (limited to 'scripts/casper-bottom/14locales')
| -rwxr-xr-x | scripts/casper-bottom/14locales | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/scripts/casper-bottom/14locales b/scripts/casper-bottom/14locales index 4297a58..5080df6 100755 --- a/scripts/casper-bottom/14locales +++ b/scripts/casper-bottom/14locales @@ -21,44 +21,37 @@ esac log_begin_msg "$DESCRIPTION" if [ -e /root/etc/default/locale ]; then - grep_file=/root/etc/default/locale - locale=$(grep 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' ) + grep_file=/root/etc/default/locale elif [ -e /root/etc/environment ]; then # Old locales policy - grep_file=/root/etc/environment + grep_file=/root/etc/environment fi -if [ -z "${grep_file}" ]; then - grep_file=/root/etc/default/locale +if [ ! -z "${grep_file}" ]; then + locale=$(grep -s 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' ) +else + grep_file=/root/etc/default/locale fi # commandline -for x in $(cat /proc/cmdline); do - case $x in - debian-installer/locale=*) - locale=${x#debian-installer/locale=} - set_locale="true" - ;; - locale=*) - locale=${x#locale=} - set_locale="true" - ;; - esac -done +if [ ! -z "${LOCALE}" ]; then + locale="${LOCALE}" + set_locale="true" +fi if [ -z "${locale}" ]; then - # Set a default one - locale=en_US.UTF-8 - set_locale="true" + # Set a default one + locale=en_US.UTF-8 + set_locale="true" fi if [ "${set_locale}" ]; then - LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 |sed -e 's, .*,,' -e q) - printf 'LANG="%s"\n' "${LANG}" >> "${grep_file}" - if [ "${BUILD_SYSTEM}" == "Debian" ]; then - chroot /root /usr/sbin/locale-gen - else - chroot /root /usr/sbin/locale-gen "${LANG}" - fi + LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 |sed -e 's, .*,,' -e q) + printf 'LANG="%s"\n' "${LANG}" >> "${grep_file}" + if [ "${BUILD_SYSTEM}" == "Debian" ]; then + chroot /root /usr/sbin/locale-gen + else + chroot /root /usr/sbin/locale-gen "${LANG}" + fi fi log_end_msg |