diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 5aead46..93709b0 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1098,8 +1098,8 @@ spcd_packages_install_git() { # │ steps │ python │ # ╰───────┴────────╯ -spcd_install_python() { - spcd_step_in "Install Python" +spcd_python_install() { + spcd_step "Install package" spcd_install_package "${SPCD_PYTHON_PACKAGE}" spcd_step "Link alias to command" spcd_python_ln "${SPCD_PYTHON_COMMAND}" @@ -1123,11 +1123,10 @@ index-url = ${SPCD_URL_PYTHON} export PATH="${SPCD_PYTHON_VENV_BINARIES}:${PATH}" export VIRTUAL_ENV="${SPCD_PYTHON_VENV}" spcd_step_out - spcd_step_out } -spcd_install_python_modules() { - spcd_step_in "Python modules" +spcd_python_modules() { + spcd_step_in "Modules" spcd_ipm__target="${SPCD_PYTHON_VENV_PACKAGES}" spcd_step "List" spcd_os_ls "${spcd_ipm__target}" @@ -1214,8 +1213,8 @@ spcd_install_packages() { spcd_step_out } -spcd_write_python_module() { - spcd_step "Write Python module" +spcd_python_write_module() { + spcd_step "Write module" for spcd_wpm__variable in \ OS_ID OS_VERSION \ PROJECT_ROOT PROJECT_PATH PROJECT_NAME \ @@ -1233,8 +1232,8 @@ SPCD_STEP = $((SPCD_STEP + 1)) done } -spcd_switch_to_python() { - spcd_step "Switch to Python" +spcd_python_switch() { + spcd_step "Switch" spcd_stp__name="$(basename "${SPCD_GIT_MAIN}")" echo "\ ${SPCD_PATH} @@ -1278,11 +1277,12 @@ spcd_main() { spcd_packages_install_git spcd_step_out # python - spcd_install_python - spcd_install_python_modules + spcd_step_in "Python" + spcd_python_install + spcd_python_modules spcd_install_packages - spcd_write_python_module - spcd_switch_to_python + spcd_python_write_module + spcd_python_switch } spcd_main