From ad043c978bb6383c5dadcf82bddc9e0d76d15058 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 30 Aug 2024 17:49:48 +0200 Subject: [PATCH 1/4] install locales --- spcd/bootstrap.sh | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 3ac96f9..16635a4 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1158,6 +1158,34 @@ spcd_step__packages_verify_https() { fi } +spcd_step__packages_install_locales() { + spcd_step "Install locales" + case "${SPCD_PM}" in + "${SPCD_PM_APK}") spcd_install_package "musl-locales" ;; + "${SPCD_PM_APT}") + unset spcd_step__pil__text + for spcd_step__pil__locale in "${@}"; do + spcd_step__pil__text="${spcd_step__pil__text}\ +${spcd_step__pil__locale}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} +" + done + spcd_os_write "/etc/locale.gen" "${spcd_step__pil__text}" + spcd_install_package "locales" + ;; + "${SPCD_PM_DNF}") + for spcd_step__pil__locale in "${@}"; do + spcd_step__pil__lang="$( + echo "${spcd_step__pil__locale}" | cut -d _ -f 2 + )" + spcd_install_package "glibc-langpack-${spcd_step__pil__lang}" + done + ;; + "${SPCD_PM_PACMAN}") spcd_install_package "glibc-locales" ;; + "${SPCD_PM_ZYPPER}") spcd_install_package "glibc-locale" ;; + *) ;; + esac +} + spcd_step__packages_upgrade_system() { spcd_step "Upgrade system" case "${SPCD_PM}" in @@ -1352,6 +1380,9 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}" # ╰──────╯ spcd_main() { + set -- \ + "${_SPCD_TXT_LANGUAGE_ENGLISH}" \ + "${_SPCD_TXT_LANGUAGE_FRENCH}" # environment spcd_txt_locale # @@ -1385,6 +1416,7 @@ spcd_main() { # packages spcd_step_in "Packages" spcd_step__packages_verify_https + spcd_step__packages_install_locales "${@}" spcd_step__packages_update_catalog spcd_step__packages_upgrade_system spcd_step__packages_install_dos2unix From 450cdea46a23d2c7ea8f4321691247a9647578a4 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 30 Aug 2024 18:08:11 +0200 Subject: [PATCH 2/4] txt/_ --- spcd/bootstrap.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 16635a4..53d9845 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -178,13 +178,11 @@ _spcd_step_wipe() { _SPCD_TXT_CHARSET="UTF-8" _SPCD_TXT_LANGUAGE_DEFAULT="C" -_SPCD_TXT_LANGUAGE_ENGLISH="en_US" -_SPCD_TXT_LANGUAGE_FRENCH="fr_FR" _spcd_txt_pick() { case "${SPCD_TXT_LANGUAGE}" in - "${_SPCD_TXT_LANGUAGE_ENGLISH}") echo "${1}" ;; - "${_SPCD_TXT_LANGUAGE_FRENCH}") echo "${2}" ;; + "${SPCD_TXT_LANGUAGE_ENGLISH}") echo "${1}" ;; + "${SPCD_TXT_LANGUAGE_FRENCH}") echo "${2}" ;; *) ;; esac } @@ -324,6 +322,9 @@ spcd_step_out() { # │ functions │ txt │ # ╰───────────┴─────╯ +SPCD_TXT_LANGUAGE_ENGLISH="en_US" +SPCD_TXT_LANGUAGE_FRENCH="fr_FR" + spcd_txt_get() { case "${1}" in "set") _spcd_txt_pick "Set" "Définir" ;; @@ -432,7 +433,7 @@ spcd_step__environment_defaults_set() { [ -n "${SPCD_REF_STAGING}" ] || SPCD_REF_STAGING="dev" [ -n "${SPCD_TXT_LANGUAGE}" ] || - SPCD_TXT_LANGUAGE="${_SPCD_TXT_LANGUAGE_ENGLISH}" + SPCD_TXT_LANGUAGE="${SPCD_TXT_LANGUAGE_ENGLISH}" [ -n "${SPCD_URL_ALMA}" ] || # /almalinux/$releasever/… @@ -1381,8 +1382,8 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}" spcd_main() { set -- \ - "${_SPCD_TXT_LANGUAGE_ENGLISH}" \ - "${_SPCD_TXT_LANGUAGE_FRENCH}" + "${SPCD_TXT_LANGUAGE_ENGLISH}" \ + "${SPCD_TXT_LANGUAGE_FRENCH}" # environment spcd_txt_locale # From b7e816b1a6fe45078114ce122e4aee9e0f0402d8 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 30 Aug 2024 21:44:37 +0200 Subject: [PATCH 3/4] mv --- spcd/bootstrap.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 53d9845..de7ccb3 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1161,6 +1161,9 @@ spcd_step__packages_verify_https() { spcd_step__packages_install_locales() { spcd_step "Install locales" + set -- \ + "${SPCD_TXT_LANGUAGE_ENGLISH}" \ + "${SPCD_TXT_LANGUAGE_FRENCH}" case "${SPCD_PM}" in "${SPCD_PM_APK}") spcd_install_package "musl-locales" ;; "${SPCD_PM_APT}") @@ -1381,9 +1384,6 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}" # ╰──────╯ spcd_main() { - set -- \ - "${SPCD_TXT_LANGUAGE_ENGLISH}" \ - "${SPCD_TXT_LANGUAGE_FRENCH}" # environment spcd_txt_locale # @@ -1417,7 +1417,7 @@ spcd_main() { # packages spcd_step_in "Packages" spcd_step__packages_verify_https - spcd_step__packages_install_locales "${@}" + spcd_step__packages_install_locales spcd_step__packages_update_catalog spcd_step__packages_upgrade_system spcd_step__packages_install_dos2unix From aac5ad09d85323f8ea441070c3030ccb6ac18dab Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 30 Aug 2024 21:56:31 +0200 Subject: [PATCH 4/4] fix/lang,locale --- spcd/bootstrap.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index de7ccb3..3738e5b 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1179,7 +1179,7 @@ ${spcd_step__pil__locale}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} "${SPCD_PM_DNF}") for spcd_step__pil__locale in "${@}"; do spcd_step__pil__lang="$( - echo "${spcd_step__pil__locale}" | cut -d _ -f 2 + echo "${spcd_step__pil__locale}" | cut -d _ -f 1 )" spcd_install_package "glibc-langpack-${spcd_step__pil__lang}" done @@ -1188,6 +1188,7 @@ ${spcd_step__pil__locale}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} "${SPCD_PM_ZYPPER}") spcd_install_package "glibc-locale" ;; *) ;; esac + spcd_txt_locale "${SPCD_TXT_LANGUAGE}" } spcd_step__packages_upgrade_system() {