diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 07f4b4f..5ff1f17 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -939,12 +939,12 @@ nameserver ${spcd_sdr__value} spcd_os_write "${SPCD_DNS_FILE}" "${spcd_sdr__text}" } -# ╭───────┬─────╮ -# │ steps │ pkg │ -# ╰───────┴─────╯ +# ╭───────┬──────────╮ +# │ steps │ packages │ +# ╰───────┴──────────╯ -spcd_set_packages_repositories() { - spcd_step "Set packages repositories" +spcd_packages_set_repositories() { + spcd_step "Set repositories" case "${SPCD_OS_ID}" in "${SPCD_OS_ALMA}") case "${SPCD_OS_VERSION}" in @@ -1010,8 +1010,8 @@ deb ${SPCD_URL_CHOSEN} ${SPCD_OS_VERSION}-security main universe esac } -spcd_set_packages_configuration() { - spcd_step "Set packages configuration" +spcd_packages_set_configuration() { + spcd_step "Set configuration" spcd_os_write "${SPCD_PM_CONF_PATH}" "${SPCD_PM_CONF_TEXT}" case "${SPCD_OS_ID}" in "${SPCD_OS_ARCH}") @@ -1024,8 +1024,6 @@ spcd_set_packages_configuration() { esac } -# agnostic steps - spcd_set_https_verification_off() { if [ -n "${SPCD_CA}" ] || [ "${SPCD_PM}" = "${SPCD_PM_APT}" ]; then spcd_step "Set HTTPS verification off" @@ -1252,15 +1250,18 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}" # ╰──────╯ spcd_main() { + # environment spcd_step_in "Environment" spcd_environment_set_variables spcd_environment_list_workspace spcd_step_out # dns spcd_dns - # pkg - spcd_set_packages_repositories - spcd_set_packages_configuration + # packages + spcd_step_in "Packages" + spcd_packages_set_repositories + spcd_packages_set_configuration + spcd_step_out # spcd_set_https_verification_off spcd_update_packages_catalog