From 442349e0dc08b1e1e99f43d7e689b47e338a95cd Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Thu, 13 Apr 2023 19:02:23 -0700
Subject: [PATCH] universal: internationalization initial release

---
 .../run                                                | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-internationalization-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-internationalization-install/run
index 6774630..a118f73 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-internationalization-install/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-internationalization-install/run
@@ -40,6 +40,7 @@ if [[ "${LSIO_BASE}" == "alpine" ]] && [[ ! -f /usr/share/fonts/noto/NotoSansCJK
     font-noto-emoji \
     lang
 elif [[ "${LSIO_BASE}" == "ubuntu" ]] && [[ ! -f /usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc ]]; then
+  # Install fonts and locales
   apt-get update
   apt-get install -y \
     fonts-noto \
@@ -128,6 +129,7 @@ elif [[ "${LSIO_BASE}" == "ubuntu" ]] && [[ ! -f /usr/share/fonts/opentype/noto/
     language-pack-zh-hans \
     language-pack-zh-hant
 elif [[ "${LSIO_BASE}" == "debian" ]] && [[ ! -f /usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc ]]; then
+  # Install fonts and locales
   apt-get update
   apt-get install -y \
     fonts-noto \
@@ -138,6 +140,7 @@ elif [[ "${LSIO_BASE}" == "debian" ]] && [[ ! -f /usr/share/fonts/opentype/noto/
     localedef -i ${LOCALE} -f UTF-8 ${LOCALE}.UTF-8
   done
 elif [[ "${LSIO_BASE}" == "fedora" ]] && [[ ! -d /usr/share/licenses/google-noto-cjk-fonts-common ]]; then
+  # Install fonts and locales
   dnf install -y \
     glibc-langpack-aa \
     glibc-langpack-af \
@@ -712,16 +715,11 @@ elif [[ "${LSIO_BASE}" == "fedora" ]] && [[ ! -d /usr/share/licenses/google-noto
     localedef -i ${LOCALE} -f UTF-8 ${LOCALE}.UTF-8
   done
 elif [[ "${LSIO_BASE}" == "arch" ]] && [[ ! -f /usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc ]]; then
+  # Install fonts
   pacman -Sy --noconfirm \
     noto-fonts-cjk \
     noto-fonts-emoji \
     noto-fonts-extra 
-  # Remove pacman lang stripping
-  sed -i '/locale/d' /etc/pacman.conf
-  sed -i '/lang/d' /etc/pacman.conf
-  # Re-install glibc
-  pacman -Sy --noconfirm \
-    glibc
   # Generate locales
   for LOCALE in ${LOCALES}; do
     echo "Generating Locale for ${LOCALE}"