spcd/main.sh

@@ -728,29 +728,28 @@ spcd_install_git() {
 # ╰───────┴────────╯
 
 spcd_install_python() {
-    spcd_step_in "Install Python"
+    spcd_step "Install Python"
     spcd_install_package "${SPCD_PYTHON_PACKAGE}"
-    spcd_step "Link alias to command"
+    spcd_substep "Link alias to command"
     spcd_ln_python "${SPCD_PYTHON_COMMAND}"
     # venv
-    spcd_step "Install virtual environment"
+    spcd_substep "Install virtual environment"
     case "${SPCD_OS_ID}" in
     "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}")
         spcd_install_package "python3-venv"
         ;;
     *) ;;
     esac
-    spcd_step "Configure PIP"
+    spcd_substep "Configure PIP"
     spcd_write "/etc/pip.conf" "\
 [global]
 index-url = ${SPCD_URL_PYTHON}
 "
-    spcd_step "Create virtual environment"
+    spcd_substep "Create virtual environment"
     "${SPCD_PYTHON_ALIAS}" -m "venv" "${SPCD_PYTHON_VENV}"
-    spcd_step "Activate virtual environment"
+    spcd_substep "Activate virtual environment"
     export PATH="${SPCD_PYTHON_VENV_BINARIES}:${PATH}"
     export VIRTUAL_ENV="${SPCD_PYTHON_VENV}"
-    spcd_step_out
 }
 
 spcd_install_python_modules() {
@@ -777,9 +776,9 @@ spcd_install_python_modules() {
 }
 
 spcd_install_packages() {
-    spcd_step_in "Install packages"
+    spcd_step "Install packages"
     # epel
-    spcd_step "Install EPEL"
+    spcd_substep "Install EPEL"
     case "${SPCD_OS_ID}" in
     "${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}")
         spcd_install_package "epel-release"
@@ -793,13 +792,13 @@ spcd_install_packages() {
     *) ;;
     esac
     # bats
-    spcd_step "Install BATS"
+    spcd_substep "Install BATS"
     spcd_install_package "bats"
     # graphviz
-    spcd_step "Install GraphViz"
+    spcd_substep "Install GraphViz"
     spcd_install_package "graphviz"
     # openssh
-    spcd_step "Install OpenSSH"
+    spcd_substep "Install OpenSSH"
     case "${SPCD_PM}" in
     "${SPCD_PM_APK}" | "${SPCD_PM_APT}")
         spcd_install_package "openssh-client"
@@ -811,13 +810,13 @@ spcd_install_packages() {
     *) ;;
     esac
     # plantuml
-    spcd_step "Install PlantUML"
+    spcd_substep "Install PlantUML"
     spcd_install_package "plantuml"
     # rsync
-    spcd_step "Install Rsync"
+    spcd_substep "Install Rsync"
     spcd_install_package "rsync"
     # shell check
-    spcd_step "Install ShellCheck"
+    spcd_substep "Install ShellCheck"
     case "${SPCD_PF}" in
     "${SPCD_PF_RPM}")
         spcd_install_package "ShellCheck"
@@ -825,7 +824,7 @@ spcd_install_packages() {
     *) spcd_install_package "shellcheck" ;;
     esac
     # shfmt
-    spcd_step "Install ShellFormat"
+    spcd_substep "Install ShellFormat"
     case "${SPCD_OS_ID}" in
     "${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}") ;;
     "${SPCD_OS_DEBIAN}")
@@ -836,7 +835,6 @@ spcd_install_packages() {
         ;;
     *) spcd_install_package "shfmt" ;;
     esac
-    spcd_step_out
 }
 
 spcd_write_python_module() {
@@ -883,7 +881,6 @@ spcd_step() {
 }
 
 spcd_step_in() {
-    [ -n "${1}" ] && spcd_step "${1}"
     SPCD_STEP_LEVEL=$((SPCD_STEP_LEVEL + 1))
     spcd_step_wipe
 }
@@ -1218,7 +1215,7 @@ spcd_banner_unset() {
 # │ internal │ step │
 # ╰──────────┴──────╯
 
-SPCD_STEP_LEVEL=1
+SPCD_STEP=1
 
 spcd_step_wipe() {
     unset \