diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 93709b0..c2320ba 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1046,13 +1046,13 @@ spcd_packages_install_tools() { # │ steps │ ca │ # ╰───────┴────╯ -spcd_install_ca_certificates() { - spcd_step "Install CA" +spcd_ca_install_package() { + spcd_step "Install package" spcd_install_package "${SPCD_PKG_CA}" } -spcd_write_ca_certificates() { - spcd_step "Write CA certificates" +spcd_ca_write_certificates() { + spcd_step "Write certificates" spcd_os_mkdir "${SPCD_CA_ROOT}" while true; do spcd_wcc__index=$((spcd_wcc__index + 1)) @@ -1065,8 +1065,8 @@ spcd_write_ca_certificates() { done } -spcd_update_ca_certificates() { - spcd_step "Update CA certificates" +spcd_ca_update_certificates() { + spcd_step "Update certificates" ${SPCD_CMD_CA} } @@ -1224,10 +1224,11 @@ spcd_python_write_module() { spcd_wpm__text="${spcd_wpm__text}${spcd_wpm__value} " done + eval "spcd_wpm__index=\$((SPCD_STEP_${SPCD_STEP_LEVEL}_INDEX + 1))" for spcd_wpm__root in \ "${SPCD_PYTHON_PACKAGES}" "${SPCD_PYTHON_VENV_PACKAGES}"; do spcd_os_write "${spcd_wpm__root}/env.py" "${spcd_wpm__text} -SPCD_STEP = $((SPCD_STEP + 1)) +SPCD_STEP = ${spcd_wpm__index} " done } @@ -1265,9 +1266,11 @@ spcd_main() { spcd_packages_install_tools spcd_step_out # ca - spcd_install_ca_certificates - spcd_write_ca_certificates - spcd_update_ca_certificates + spcd_step_in "CA" + spcd_ca_install_package + spcd_ca_write_certificates + spcd_ca_update_certificates + spcd_step_out # packages spcd_step_in "Packages" spcd_packages_verify_https