File tree Expand file tree Collapse file tree 1 file changed +4
-6
lines changed
root/etc/s6-overlay/s6-rc.d/init-mod-universal-internationalization-install Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -40,6 +40,7 @@ if [[ "${LSIO_BASE}" == "alpine" ]] && [[ ! -f /usr/share/fonts/noto/NotoSansCJK
4040 font-noto-emoji \
4141 lang
4242elif [[ "${LSIO_BASE}" == "ubuntu" ]] && [[ ! -f /usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc ]]; then
43+ # Install fonts and locales
4344 apt-get update
4445 apt-get install -y \
4546 fonts-noto \
@@ -128,6 +129,7 @@ elif [[ "${LSIO_BASE}" == "ubuntu" ]] && [[ ! -f /usr/share/fonts/opentype/noto/
128129 language-pack-zh-hans \
129130 language-pack-zh-hant
130131elif [[ "${LSIO_BASE}" == "debian" ]] && [[ ! -f /usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc ]]; then
132+ # Install fonts and locales
131133 apt-get update
132134 apt-get install -y \
133135 fonts-noto \
@@ -138,6 +140,7 @@ elif [[ "${LSIO_BASE}" == "debian" ]] && [[ ! -f /usr/share/fonts/opentype/noto/
138140 localedef -i ${LOCALE} -f UTF-8 ${LOCALE}.UTF-8
139141 done
140142elif [[ "${LSIO_BASE}" == "fedora" ]] && [[ ! -d /usr/share/licenses/google-noto-cjk-fonts-common ]]; then
143+ # Install fonts and locales
141144 dnf install -y \
142145 glibc-langpack-aa \
143146 glibc-langpack-af \
@@ -712,16 +715,11 @@ elif [[ "${LSIO_BASE}" == "fedora" ]] && [[ ! -d /usr/share/licenses/google-noto
712715 localedef -i ${LOCALE} -f UTF-8 ${LOCALE}.UTF-8
713716 done
714717elif [[ "${LSIO_BASE}" == "arch" ]] && [[ ! -f /usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc ]]; then
718+ # Install fonts
715719 pacman -Sy --noconfirm \
716720 noto-fonts-cjk \
717721 noto-fonts-emoji \
718722 noto-fonts-extra
719- # Remove pacman lang stripping
720- sed -i '/locale/d' /etc/pacman.conf
721- sed -i '/lang/d' /etc/pacman.conf
722- # Re-install glibc
723- pacman -Sy --noconfirm \
724- glibc
725723 # Generate locales
726724 for LOCALE in ${LOCALES}; do
727725 echo "Generating Locale for ${LOCALE}"
You can’t perform that action at this time.
0 commit comments