From e3a9b871252c9ffefbc904d9349080011d745932 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Tue, 27 Aug 2024 13:04:09 +0200 Subject: [PATCH] step__ --- spcd/bootstrap.sh | 82 +++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index cee22ef..26aed02 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -366,7 +366,7 @@ SPCD_PM_ZYPPER="zypper" # │ step │ environment │ # ╰──────┴─────────────╯ -spcd_environment_set_variables() { +spcd_step__environment_set_variables() { spcd_step "Set variables" # check script first [ -n "${SPCD}" ] || spcd_error_ci "SPCD" @@ -705,7 +705,7 @@ ${SPCD_PYTHON_VENV}/lib/${SPCD_PYTHON_COMMAND}/site-packages" spcd_os_printenv "SPCD_DL" } -spcd_environment_list_workspace() { +spcd_step__environment_list_workspace() { spcd_step "List workspace" spcd_lwd__path="$(realpath .)" spcd_os_ls "${spcd_lwd__path}" @@ -804,7 +804,7 @@ spcd_query_package() { # │ step │ dns │ # ╰──────┴─────╯ -spcd_dns() { +spcd_step__dns() { spcd_step "DNS" while true; do spcd_sdr__index=$((spcd_sdr__index + 1)) @@ -821,7 +821,7 @@ nameserver ${spcd_sdr__value} # │ step │ packages │ # ╰──────┴──────────╯ -spcd_packages_set_repositories() { +spcd_step__packages_set_repositories() { spcd_step "Set repositories" case "${SPCD_OS_ID}" in "${SPCD_OS_ALMA}") @@ -888,7 +888,7 @@ deb ${SPCD_URL_CHOSEN} ${SPCD_OS_VERSION}-security main universe esac } -spcd_packages_set_configuration() { +spcd_step__packages_set_configuration() { spcd_step "Set configuration" case "${SPCD_PM}" in "${SPCD_PM_DNF}") @@ -926,7 +926,7 @@ Dir::Etc::SourceParts \"\"; esac } -spcd_packages_trust_https() { +spcd_step__packages_trust_https() { spcd_step "Trust HTTPS" if [ -n "${SPCD_CA_1}" ] || [ "${SPCD_PM}" = "${SPCD_PM_APT}" ]; then spcd_pth__path="$(spcd_https_path)" @@ -954,7 +954,7 @@ SSLVerify = No fi } -spcd_packages_update_catalog() { +spcd_step__packages_update_catalog() { spcd_step "Update catalog" case "${SPCD_PM}" in "${SPCD_PM_APK}") apk update ;; @@ -966,7 +966,7 @@ spcd_packages_update_catalog() { esac } -spcd_packages_install_tools() { +spcd_step__packages_install_tools() { spcd_step "Install tools" case "${SPCD_PM}" in "${SPCD_PM_APT}") spcd_install_package "apt-utils" ;; @@ -978,12 +978,12 @@ spcd_packages_install_tools() { # │ step │ ca │ # ╰──────┴────╯ -spcd_ca_install_package() { +spcd_step__ca_install_package() { spcd_step "Install package" spcd_install_package "ca-certificates" } -spcd_ca_write_certificates() { +spcd_step__ca_write_certificates() { spcd_step "Write certificates" case "${SPCD_OS_ID}" in "${SPCD_OS_ALMA}" | "${SPCD_OS_FEDORA}" | "${SPCD_OS_ROCKY}") @@ -1012,7 +1012,7 @@ spcd_ca_write_certificates() { done } -spcd_ca_update_certificates() { +spcd_step__ca_update_certificates() { spcd_step "Update certificates" case "${SPCD_OS_ID}" in "${SPCD_OS_ARCH}" | \ @@ -1035,13 +1035,13 @@ spcd_ca_update_certificates() { # │ step │ packages │ # ╰──────┴──────────╯ -spcd_packages_verify_https() { +spcd_step__packages_verify_https() { spcd_step "Verify HTTPS" spcd_pvh__path="$(spcd_https_path)" [ -n "${spcd_pvh__path}" ] && spcd_os_rm "${spcd_pvh__path}" } -spcd_packages_upgrade_system() { +spcd_step__packages_upgrade_system() { spcd_step "Upgrade system" case "${SPCD_PM}" in "${SPCD_PM_APK}") apk upgrade ;; @@ -1053,12 +1053,12 @@ spcd_packages_upgrade_system() { esac } -spcd_packages_install_dos2unix() { +spcd_step__packages_install_dos2unix() { spcd_step "Install dos2unix" spcd_install_package "dos2unix" } -spcd_packages_install_git() { +spcd_step__packages_install_git() { spcd_step "Install Git" spcd_install_package "git" } @@ -1067,7 +1067,7 @@ spcd_packages_install_git() { # │ step │ python │ # ╰──────┴────────╯ -spcd_python_install() { +spcd_step__python_install() { spcd_step "Install package" spcd_install_package "${SPCD_PYTHON_PACKAGE}" spcd_step "Link alias to command" @@ -1094,7 +1094,7 @@ index-url = ${SPCD_URL_PYTHON} spcd_step_out } -spcd_python_modules() { +spcd_step__python_modules() { spcd_step_in "Modules" spcd_ipm__target="${SPCD_PYTHON_VENV_PACKAGES}" spcd_step "List" @@ -1119,7 +1119,7 @@ spcd_python_modules() { spcd_step_out } -spcd_install_packages() { +spcd_step__install_packages() { spcd_step_in "OS packages" # epel spcd_step "EPEL" @@ -1179,7 +1179,7 @@ spcd_install_packages() { spcd_step_out } -spcd_python_write_module() { +spcd_step__python_write_module() { spcd_step "Write module" for spcd_wpm__variable in \ OS_ID OS_VERSION \ @@ -1199,7 +1199,7 @@ SPCD_STEP = ${spcd_wpm__index} done } -spcd_python_switch() { +spcd_step__python_switch() { spcd_step "Switch" spcd_stp__name="$(basename "${SPCD_GIT_MAIN}")" spcd_stp__path="$(realpath "${0}")" @@ -1217,40 +1217,40 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}" spcd_main() { # environment spcd_step_in "Environment" - spcd_environment_set_variables - spcd_environment_list_workspace + spcd_step__environment_set_variables + spcd_step__environment_list_workspace spcd_step_out # dns - spcd_dns + spcd_step__dns # packages spcd_step_in "Packages" - spcd_packages_set_repositories - spcd_packages_set_configuration - spcd_packages_trust_https - spcd_packages_update_catalog - spcd_packages_install_tools + spcd_step__packages_set_repositories + spcd_step__packages_set_configuration + spcd_step__packages_trust_https + spcd_step__packages_update_catalog + spcd_step__packages_install_tools spcd_step_out # ca spcd_step_in "CA" - spcd_ca_install_package - spcd_ca_write_certificates - spcd_ca_update_certificates + spcd_step__ca_install_package + spcd_step__ca_write_certificates + spcd_step__ca_update_certificates spcd_step_out # packages spcd_step_in "Packages" - spcd_packages_verify_https - spcd_packages_update_catalog - spcd_packages_upgrade_system - spcd_packages_install_dos2unix - spcd_packages_install_git + spcd_step__packages_verify_https + spcd_step__packages_update_catalog + spcd_step__packages_upgrade_system + spcd_step__packages_install_dos2unix + spcd_step__packages_install_git spcd_step_out # python spcd_step_in "Python" - spcd_python_install - spcd_python_modules - spcd_install_packages - spcd_python_write_module - spcd_python_switch + spcd_step__python_install + spcd_step__python_modules + spcd_step__install_packages + spcd_step__python_write_module + spcd_step__python_switch } spcd_main