diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index bef0c18..00ce18e 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -404,7 +404,7 @@ SPCD_PM_ZYPPER="zypper" # │ step │ environment │ # ╰──────┴─────────────╯ -spcd_step__environment_defaults_print() { +spcd_step__environment_print() { spcd_ca "list" spcd_dns "list" set -- \ @@ -1222,6 +1222,15 @@ spcd_step__packages_install_tools() { esac } +spcd_step__packages_install_locales() { + spcd_step_in "Locales" + spcd_step "Install" + spcd_txt_locales "install" + spcd_step "Set" + spcd_txt_locale "set" "${SPCD_TXT_LOCALE}" + spcd_step_out +} + # ╭──────┬────╮ # │ step │ ca │ # ╰──────┴────╯ @@ -1285,12 +1294,6 @@ spcd_step__packages_verify_https() { fi } -spcd_step__packages_install_locales() { - spcd_step "Install locales" - spcd_txt_locales "install" - spcd_txt_locale "set" "${SPCD_TXT_LOCALE}" -} - spcd_step__packages_upgrade_system() { spcd_step "Upgrade system" case "${SPCD_PM}" in @@ -1490,15 +1493,13 @@ ${SPCD_PYTHON_ALIAS} / ${name}" spcd_main() { # environment - spcd_txt_locale "set" - # spcd_step_in "Environment" spcd_step_in "Defaults" spcd_step "Print defined" - spcd_step__environment_defaults_print + spcd_step__environment_print spcd_step__environment_defaults_set spcd_step "Print effective" - spcd_step__environment_defaults_print + spcd_step__environment_print spcd_step_out spcd_step__environment_set_variables spcd_step__environment_list_workspace @@ -1512,6 +1513,7 @@ spcd_main() { spcd_step__packages_trust_https spcd_step__packages_update_catalog spcd_step__packages_install_tools + spcd_step__packages_install_locales spcd_step_out # ca spcd_step_in "CA" @@ -1522,7 +1524,6 @@ 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