From 636f53713b29cb70fb611c320fa6b2de12e68c64 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Sun, 25 Aug 2024 23:35:16 +0200
Subject: [PATCH 01/16] spcd_openssl_x509

---
 spcd/main.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/spcd/main.sh b/spcd/main.sh
index 6481aa0..4ff3caa 100644
--- a/spcd/main.sh
+++ b/spcd/main.sh
@@ -1036,7 +1036,7 @@ spcd_write_ca_certificates() {
         spcd_wcc__path="${SPCD_CA_ROOT}/${spcd_wcc__index}.crt"
         spcd_split
         spcd_os_write "${spcd_wcc__path}" "${spcd_wcc__text}"
-        spcd_openssl "${spcd_wcc__path}"
+        spcd_openssl_x509 "${spcd_wcc__path}"
     done
 }
 
@@ -1232,13 +1232,12 @@ spcd_install_package() {
     fi
 }
 
-spcd_openssl() {
-    spcd_openssl__file="${1}"
-    if [ -f "${spcd_openssl__file}" ]; then
+spcd_openssl_x509() {
+    spcd_openssl_x509__file="${1}"
+    if [ -f "${spcd_openssl_x509__file}" ]; then
         openssl x509 \
-            -in "${spcd_openssl__file}" \
-            -noout -text ||
-            exit
+            -in "${spcd_openssl_x509__file}" \
+            -noout -text
     fi
 }
 

From 530681b688f8112b143fa7eba7dcd428117b6e87 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Sun, 25 Aug 2024 23:37:06 +0200
Subject: [PATCH 02/16] mv

---
 spcd/main.sh | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/spcd/main.sh b/spcd/main.sh
index 4ff3caa..69e876e 100644
--- a/spcd/main.sh
+++ b/spcd/main.sh
@@ -251,6 +251,19 @@ spcd_git_url() {
     fi
 }
 
+# ╭───────────┬─────────╮
+# │ functions │ openssl │
+# ╰───────────┴─────────╯
+
+spcd_openssl_x509() {
+    spcd_openssl_x509__file="${1}"
+    if [ -f "${spcd_openssl_x509__file}" ]; then
+        openssl x509 \
+            -in "${spcd_openssl_x509__file}" \
+            -noout -text
+    fi
+}
+
 # ╭───────────┬────╮
 # │ functions │ os │
 # ╰───────────┴────╯
@@ -1232,15 +1245,6 @@ spcd_install_package() {
     fi
 }
 
-spcd_openssl_x509() {
-    spcd_openssl_x509__file="${1}"
-    if [ -f "${spcd_openssl_x509__file}" ]; then
-        openssl x509 \
-            -in "${spcd_openssl_x509__file}" \
-            -noout -text
-    fi
-}
-
 #╶──────────────────────────────────────╴
 
 # ╭──────╮

From 82ac82da2fa3ee49c48508a1b3b86ad13361b3a1 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Sun, 25 Aug 2024 23:55:52 +0200
Subject: [PATCH 03/16] =?UTF-8?q?=E2=88=92exit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spcd/main.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/spcd/main.sh b/spcd/main.sh
index 69e876e..f5a521b 100644
--- a/spcd/main.sh
+++ b/spcd/main.sh
@@ -184,7 +184,7 @@ spcd_os_cat() {
     spcd_cat__file="${1}"
     if [ -n "${spcd_cat__file}" ]; then
         spcd_frame_open "${spcd_cat__file}"
-        cat "${spcd_cat__file}" || exit
+        cat "${spcd_cat__file}"
         spcd_frame_shut "${spcd_cat__file}"
     fi
 }
@@ -307,7 +307,7 @@ spcd_os_rm() {
     spcd_os_rm__path="${1}"
     if [ -e "${spcd_os_rm__path}" ]; then
         echo "← ${spcd_os_rm__path}"
-        rm -r "${spcd_os_rm__path}" || exit
+        rm -r "${spcd_os_rm__path}"
     fi
 }
 
@@ -344,7 +344,7 @@ spcd_python_ln() {
     if [ -n "${spcd_python_ln__command}" ]; then
         echo "→ ${SPCD_PYTHON_ALIAS} → ${spcd_python_ln__command}"
         ln -f -s "${spcd_python_ln__command}" \
-            "/usr/bin/${SPCD_PYTHON_ALIAS}" || exit
+            "/usr/bin/${SPCD_PYTHON_ALIAS}"
     fi
 }
 
@@ -1022,7 +1022,7 @@ nameserver ${spcd_sdr__value}
 
 spcd_update_packages_catalog() {
     spcd_step "Update packages catalog"
-    ${SPCD_PM_UPDATE} || exit
+    ${SPCD_PM_UPDATE}
 }
 
 spcd_install_packages_tools() {
@@ -1055,7 +1055,7 @@ spcd_write_ca_certificates() {
 
 spcd_update_ca_certificates() {
     spcd_step "Update CA certificates"
-    ${SPCD_CMD_CA} || exit
+    ${SPCD_CMD_CA}
 }
 
 # ╭───────┬─────╮
@@ -1069,7 +1069,7 @@ spcd_set_https_verification_on() {
 
 spcd_upgrade_packages() {
     spcd_step "Upgrade packages"
-    ${SPCD_PM_UPGRADE} || exit
+    ${SPCD_PM_UPGRADE}
 }
 
 spcd_install_dos2unix() {
@@ -1240,8 +1240,8 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}"
 spcd_install_package() {
     spcd_install_package__name="${1}"
     if [ -n "${spcd_install_package__name}" ]; then
-        ${SPCD_PM_INSTALL} "${spcd_install_package__name}" || exit
-        ${SPCD_PM_CLEAN} || exit
+        ${SPCD_PM_INSTALL} "${spcd_install_package__name}"
+        ${SPCD_PM_CLEAN}
     fi
 }
 

From 03cde379b700af3a9f650a6bfe3a35527d65038a Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 00:10:46 +0200
Subject: [PATCH 04/16] bootstrap.sh

---
 spcd/{main.sh => bootstrap.sh} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename spcd/{main.sh => bootstrap.sh} (99%)

diff --git a/spcd/main.sh b/spcd/bootstrap.sh
similarity index 99%
rename from spcd/main.sh
rename to spcd/bootstrap.sh
index f5a521b..dfbf3d1 100644
--- a/spcd/main.sh
+++ b/spcd/bootstrap.sh
@@ -1123,7 +1123,7 @@ spcd_install_python_modules() {
     spcd_ipm__path="$(spcd_python_pip "${SPCD_GIT_MAIN}")"
     # check matching of file and variable
     spcd_step "Check"
-    spcd_ipm__script="${spcd_ipm__path}/main.sh"
+    spcd_ipm__script="${spcd_ipm__path}/bootstrap.sh"
     ls -l "${spcd_ipm__script}"
     spcd_ipm__check="${spcd_ipm__script}.${SPCD_CMD_SUM}"
     "${SPCD_CMD_SUM}" "${spcd_ipm__script}" >"${spcd_ipm__check}"

From a88c031ec3c9c070120af4f3d3bb25ef171ef230 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 00:22:17 +0200
Subject: [PATCH 05/16] steps/functions

---
 spcd/bootstrap.sh | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index dfbf3d1..bbb67d3 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -912,6 +912,18 @@ spcd_list_working_directory() {
     spcd_os_ls "${spcd_lwd__path}"
 }
 
+# ╭───────┬───────────╮
+# │ steps │ functions │
+# ╰───────┴───────────╯
+
+spcd_install_package() {
+    spcd_install_package__name="${1}"
+    if [ -n "${spcd_install_package__name}" ]; then
+        ${SPCD_PM_INSTALL} "${spcd_install_package__name}"
+        ${SPCD_PM_CLEAN}
+    fi
+}
+
 # ╭───────┬─────╮
 # │ steps │ pkg │
 # ╰───────┴─────╯
@@ -1233,20 +1245,6 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}"
 
 #╶──────────────────────────────────────╴
 
-# ╭───────────╮
-# │ functions │
-# ╰───────────╯
-
-spcd_install_package() {
-    spcd_install_package__name="${1}"
-    if [ -n "${spcd_install_package__name}" ]; then
-        ${SPCD_PM_INSTALL} "${spcd_install_package__name}"
-        ${SPCD_PM_CLEAN}
-    fi
-}
-
-#╶──────────────────────────────────────╴
-
 # ╭──────╮
 # │ main │
 # ╰──────╯

From de4c334582f08a7b5f6fab0a868ca0861f7a5002 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 00:30:20 +0200
Subject: [PATCH 06/16] environment

---
 spcd/bootstrap.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index bbb67d3..de5261c 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -421,12 +421,12 @@ SPCD_PM_ZYPPER="zypper"
 SPCD_PYTHON_VENV="/opt/venv"
 SPCD_PYTHON_VENV_BINARIES="${SPCD_PYTHON_VENV}/bin"
 
-# ╭───────┬─────╮
-# │ steps │ env │
-# ╰───────┴─────╯
+# ╭───────┬─────────────╮
+# │ steps │ environment │
+# ╰───────┴─────────────╯
 
-spcd_set_environment_variables() {
-    spcd_step "Set environment variables"
+spcd_environment_set_variables() {
+    spcd_step "Set variables"
     # check script first
     [ -n "${SPCD}" ] || spcd_error_ci "SPCD"
     # continuous integration / github → gitea → forgejo
@@ -906,8 +906,8 @@ ${SPCD_PYTHON_VENV}/lib/${SPCD_PYTHON_COMMAND}/site-packages"
     spcd_os_printenv "SPCD_CA" "SPCD_DL"
 }
 
-spcd_list_working_directory() {
-    spcd_step "List working directory"
+spcd_environment_list_workspace() {
+    spcd_step "List workspace"
     spcd_lwd__path="$(realpath .)"
     spcd_os_ls "${spcd_lwd__path}"
 }
@@ -1250,9 +1250,10 @@ ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}"
 # ╰──────╯
 
 spcd_main() {
-    # env
-    spcd_set_environment_variables
-    spcd_list_working_directory
+    spcd_step_in "Environment"
+    spcd_environment_set_variables
+    spcd_environment_list_workspace
+    spcd_step_out
     # pkg
     spcd_set_packages_repositories
     spcd_set_packages_configuration

From d546eb8377e4a073d9c2b9d9e52ba2458791a657 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 01:02:41 +0200
Subject: [PATCH 07/16] =?UTF-8?q?=E2=88=92rule?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spcd/bootstrap.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index de5261c..592dd3a 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1,7 +1,5 @@
 #! /usr/bin/env sh
 
-#╶──────────────────────────────────────╴
-
 # ╭──────────╮
 # │ defaults │
 # ╰──────────╯

From 10e5685bf530ed0fbb5c8c2f8662305bd86ba43c Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 01:10:56 +0200
Subject: [PATCH 08/16] spcd_dns

---
 spcd/bootstrap.sh | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 592dd3a..07f4b4f 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -922,6 +922,23 @@ spcd_install_package() {
     fi
 }
 
+# ╭───────┬─────╮
+# │ steps │ dns │
+# ╰───────┴─────╯
+
+spcd_dns() {
+    spcd_step "DNS"
+    while true; do
+        spcd_sdr__index=$((spcd_sdr__index + 1))
+        eval "spcd_sdr__value=\"\${SPCD_DNS_${spcd_sdr__index}}\""
+        [ -n "${spcd_sdr__value}" ] || break
+        spcd_sdr__text="${spcd_sdr__text}\
+nameserver ${spcd_sdr__value}
+"
+    done
+    spcd_os_write "${SPCD_DNS_FILE}" "${spcd_sdr__text}"
+}
+
 # ╭───────┬─────╮
 # │ steps │ pkg │
 # ╰───────┴─────╯
@@ -1017,19 +1034,6 @@ spcd_set_https_verification_off() {
     fi
 }
 
-spcd_set_dns_resolving() {
-    spcd_step "Set DNS resolving"
-    while true; do
-        spcd_sdr__index=$((spcd_sdr__index + 1))
-        eval "spcd_sdr__value=\"\${SPCD_DNS_${spcd_sdr__index}}\""
-        [ -n "${spcd_sdr__value}" ] || break
-        spcd_sdr__text="${spcd_sdr__text}\
-nameserver ${spcd_sdr__value}
-"
-    done
-    spcd_os_write "${SPCD_DNS_FILE}" "${spcd_sdr__text}"
-}
-
 spcd_update_packages_catalog() {
     spcd_step "Update packages catalog"
     ${SPCD_PM_UPDATE}
@@ -1252,12 +1256,13 @@ spcd_main() {
     spcd_environment_set_variables
     spcd_environment_list_workspace
     spcd_step_out
+    # dns
+    spcd_dns
     # pkg
     spcd_set_packages_repositories
     spcd_set_packages_configuration
     #
     spcd_set_https_verification_off
-    spcd_set_dns_resolving
     spcd_update_packages_catalog
     spcd_install_packages_tools
     # ca

From 617695589fdfc9462ea43f2a0015f9ec4705ba08 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 01:22:38 +0200
Subject: [PATCH 09/16] packages

---
 spcd/bootstrap.sh | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

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

From a217194d8079ae07ccdd3a754834b5a829735cbe Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 01:33:33 +0200
Subject: [PATCH 10/16] trust https

---
 spcd/bootstrap.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 5ff1f17..223cd70 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1024,9 +1024,9 @@ spcd_packages_set_configuration() {
     esac
 }
 
-spcd_set_https_verification_off() {
+spcd_packages_trust_https() {
+    spcd_step "Trust HTTPS"
     if [ -n "${SPCD_CA}" ] || [ "${SPCD_PM}" = "${SPCD_PM_APT}" ]; then
-        spcd_step "Set HTTPS verification off"
         spcd_os_mkdir "$(dirname "${SPCD_PM_HTTPS_PATH}")"
         spcd_os_write "${SPCD_PM_HTTPS_PATH}" "${SPCD_PM_HTTPS_TEXT}"
     fi
@@ -1261,9 +1261,9 @@ spcd_main() {
     spcd_step_in "Packages"
     spcd_packages_set_repositories
     spcd_packages_set_configuration
+    spcd_packages_trust_https
     spcd_step_out
     #
-    spcd_set_https_verification_off
     spcd_update_packages_catalog
     spcd_install_packages_tools
     # ca

From 4c6eac7b5f6e867e7ba0fdf85ffead42daa17bc5 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 01:36:25 +0200
Subject: [PATCH 11/16] catalog

---
 spcd/bootstrap.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 223cd70..2b15782 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1032,8 +1032,8 @@ spcd_packages_trust_https() {
     fi
 }
 
-spcd_update_packages_catalog() {
-    spcd_step "Update packages catalog"
+spcd_packages_update_catalog() {
+    spcd_step "Update catalog"
     ${SPCD_PM_UPDATE}
 }
 
@@ -1262,9 +1262,9 @@ spcd_main() {
     spcd_packages_set_repositories
     spcd_packages_set_configuration
     spcd_packages_trust_https
+    spcd_packages_update_catalog
     spcd_step_out
     #
-    spcd_update_packages_catalog
     spcd_install_packages_tools
     # ca
     spcd_install_ca_certificates

From 789d67654e045917d992640456ac1d5cba060058 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 01:39:55 +0200
Subject: [PATCH 12/16] tools

---
 spcd/bootstrap.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 2b15782..476161d 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1037,8 +1037,8 @@ spcd_packages_update_catalog() {
     ${SPCD_PM_UPDATE}
 }
 
-spcd_install_packages_tools() {
-    spcd_step "Install packages tools"
+spcd_packages_install_tools() {
+    spcd_step "Install tools"
     spcd_install_package "${SPCD_PKG_PKG}"
 }
 
@@ -1263,9 +1263,8 @@ spcd_main() {
     spcd_packages_set_configuration
     spcd_packages_trust_https
     spcd_packages_update_catalog
+    spcd_packages_install_tools
     spcd_step_out
-    #
-    spcd_install_packages_tools
     # ca
     spcd_install_ca_certificates
     spcd_write_ca_certificates

From 906528b15c2b6723c131ff152e10d542c587510e Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 01:44:43 +0200
Subject: [PATCH 13/16] verify https

---
 spcd/bootstrap.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 476161d..35c7eb2 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1070,12 +1070,12 @@ spcd_update_ca_certificates() {
     ${SPCD_CMD_CA}
 }
 
-# ╭───────┬─────╮
-# │ steps │ pkg │
-# ╰───────┴─────╯
+# ╭───────┬──────────╮
+# │ steps │ packages │
+# ╰───────┴──────────╯
 
-spcd_set_https_verification_on() {
-    spcd_step "Set HTTPS verification on"
+spcd_packages_verify_https() {
+    spcd_step "Verify HTTPS"
     spcd_os_rm "${SPCD_PM_HTTPS_PATH}"
 }
 
@@ -1269,12 +1269,14 @@ spcd_main() {
     spcd_install_ca_certificates
     spcd_write_ca_certificates
     spcd_update_ca_certificates
-    # pkg
-    spcd_set_https_verification_on
+    # packages
+    spcd_step_in "Packages"
+    spcd_packages_verify_https
     spcd_update_packages_catalog
     spcd_upgrade_packages
     spcd_install_dos2unix
     spcd_install_git
+    spcd_step_out
     # python
     spcd_install_python
     spcd_install_python_modules

From af90952b5c73007d7e8ad13ea040b9ea0f6e1cdc Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 01:48:01 +0200
Subject: [PATCH 14/16] upgrade system

---
 spcd/bootstrap.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 35c7eb2..131c500 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1079,8 +1079,8 @@ spcd_packages_verify_https() {
     spcd_os_rm "${SPCD_PM_HTTPS_PATH}"
 }
 
-spcd_upgrade_packages() {
-    spcd_step "Upgrade packages"
+spcd_packages_upgrade_system() {
+    spcd_step "Upgrade system"
     ${SPCD_PM_UPGRADE}
 }
 
@@ -1272,11 +1272,11 @@ spcd_main() {
     # packages
     spcd_step_in "Packages"
     spcd_packages_verify_https
-    spcd_update_packages_catalog
-    spcd_upgrade_packages
+    spcd_packages_update_catalog
+    spcd_packages_upgrade_system
+    spcd_step_out
     spcd_install_dos2unix
     spcd_install_git
-    spcd_step_out
     # python
     spcd_install_python
     spcd_install_python_modules

From 8c0ae4174c5d13849e6a8a4cd1f3c1c0a194a1c9 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 01:50:23 +0200
Subject: [PATCH 15/16] dos2unix,git

---
 spcd/bootstrap.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 131c500..5aead46 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1084,12 +1084,12 @@ spcd_packages_upgrade_system() {
     ${SPCD_PM_UPGRADE}
 }
 
-spcd_install_dos2unix() {
+spcd_packages_install_dos2unix() {
     spcd_step "Install dos2unix"
     spcd_install_package "${SPCD_PKG_DOS2UNIX}"
 }
 
-spcd_install_git() {
+spcd_packages_install_git() {
     spcd_step "Install Git"
     spcd_install_package "${SPCD_PKG_GIT}"
 }
@@ -1274,9 +1274,9 @@ spcd_main() {
     spcd_packages_verify_https
     spcd_packages_update_catalog
     spcd_packages_upgrade_system
+    spcd_packages_install_dos2unix
+    spcd_packages_install_git
     spcd_step_out
-    spcd_install_dos2unix
-    spcd_install_git
     # python
     spcd_install_python
     spcd_install_python_modules

From f92d49fe82572ce69b794259c8108bfa7176c401 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 03:00:48 +0200
Subject: [PATCH 16/16] python

---
 spcd/bootstrap.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

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