diff --git a/README.md b/README.md index 8e13071..b62e2c6 100644 --- a/README.md +++ b/README.md @@ -191,7 +191,7 @@ you can use the installer to chroot into an existing system. Run `./install --he If you encounter this problem, you might be able to fix the problem by switching to testing by dropping to a shell temporarily: ``` -# Press S when ased about what to do next. +# Press S when asked about what to do next. # This opens an emergency shell in the chroot. echo 'ACCEPT_KEYWORDS="~amd64"' >> /etc/portage/make.conf # Enable testing for your architecture. emerge -v gentoo-kernel-bin # Update kernel to newest version diff --git a/configure b/configure index 07ae2d6..383c418 100755 --- a/configure +++ b/configure @@ -108,14 +108,6 @@ function get_all_timezones() { readarray -t ALL_TIMEZONES < <(find /usr/share/zoneinfo -type f -printf "%P\n" | sort -u) } -function get_supported_locales() { - if [[ -e /usr/share/i18n/SUPPORTED ]]; then - echo /usr/share/i18n/SUPPORTED - else - echo "$GENTOO_INSTALL_REPO_DIR/contrib/i18n_supported" - fi -} - function recalculate_locales() { LOCALES="" N_LOCALES=0 @@ -329,7 +321,7 @@ function create_btrfs_centric_layout() { get_all_keymaps get_all_timezones -readarray -t SUPPORTED_LOCALES < "$(get_supported_locales)" +readarray -t SUPPORTED_LOCALES < "$GENTOO_INSTALL_REPO_DIR/contrib/i18n_supported" readarray -t LOCALE_A < <(locale -a) diff --git a/contrib/i18n_supported b/contrib/i18n_supported index eb2abc7..7ea7352 100644 --- a/contrib/i18n_supported +++ b/contrib/i18n_supported @@ -1,4 +1,3 @@ -C.UTF-8 UTF-8 aa_DJ.UTF-8 UTF-8 aa_DJ ISO-8859-1 aa_ER UTF-8 @@ -77,6 +76,7 @@ brx_IN UTF-8 bs_BA.UTF-8 UTF-8 bs_BA ISO-8859-2 byn_ER UTF-8 +C.UTF-8 UTF-8 ca_AD.UTF-8 UTF-8 ca_AD ISO-8859-15 ca_ES.UTF-8 UTF-8