From 6685170c4f548003600f986958a5eb2cd86563cd Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Sun, 8 Sep 2024 22:58:57 +0200
Subject: [PATCH 01/26] steps/dns

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index c0061ce..fb89491 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1174,15 +1174,6 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET}
 # │ s = step │
 # ╰───┴──────╯
 
-# ╭───┬─────╮
-# │ s │ dns │
-# ╰───┴─────╯
-
-spcd_step__dns() {
-    spcd_step "DNS"
-    spcd_dns "write"
-}
-
 # ╭───┬──────────╮
 # │ s │ packages │
 # ╰───┴──────────╯
@@ -1571,7 +1562,8 @@ spcd_main() {
     spcd_step__environment_list_workspace
     spcd_step_out
     # dns
-    spcd_step__dns
+    spcd_step "DNS"
+    spcd_dns "write"
     # packages
     spcd_step_in "Packages"
     spcd_step__packages_set_repositories

From dc47ace951b0e5bcfef8df6b9b904a31842fc892 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Sun, 8 Sep 2024 23:01:41 +0200
Subject: [PATCH 02/26] f/dns

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index fb89491..c1e64aa 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -235,30 +235,6 @@ spcd_ca() {
     done
 }
 
-spcd_dns() {
-    local index name text value
-    while true; do
-        index=$((index + 1))
-        name="SPCD_DNS_${index}"
-        eval "value=\"\${${name}}\""
-        [ -n "${value}" ] || break
-        case "${1}" in
-        "list")
-            spcd_os_printenv "${name}"
-            ;;
-        "write")
-            text="${text}\
-nameserver ${value}
-"
-            ;;
-        *) ;;
-        esac
-    done
-    if [ "${1}" = "write" ]; then
-        spcd_os_write "/etc/resolv.conf" "${text}"
-    fi
-}
-
 spcd_run() {
     if [ -n "${1}" ]; then
         _spcd_frame_open "${@}"
@@ -426,7 +402,7 @@ SPCD_PM_ZYPPER="zypper"
 
 spcd_step__environment_print() {
     spcd_ca "list"
-    spcd_dns "list"
+    spcd_f_dns "list"
     set -- \
         "GIT_RWX" \
         "GIT_SPCD" \
@@ -794,6 +770,30 @@ spcd_step__environment_list_workspace() {
 # │ f = function │
 # ╰──────────────╯
 
+spcd_f_dns() {
+    local index name text value
+    while true; do
+        index=$((index + 1))
+        name="SPCD_DNS_${index}"
+        eval "value=\"\${${name}}\""
+        [ -n "${value}" ] || break
+        case "${1}" in
+        "list")
+            spcd_os_printenv "${name}"
+            ;;
+        "write")
+            text="${text}\
+nameserver ${value}
+"
+            ;;
+        *) ;;
+        esac
+    done
+    if [ "${1}" = "write" ]; then
+        spcd_os_write "/etc/resolv.conf" "${text}"
+    fi
+}
+
 spcd_git_clone() {
     if [ -n "${1}" ]; then
         local name path url
@@ -1563,7 +1563,7 @@ spcd_main() {
     spcd_step_out
     # dns
     spcd_step "DNS"
-    spcd_dns "write"
+    spcd_f_dns "write"
     # packages
     spcd_step_in "Packages"
     spcd_step__packages_set_repositories

From d453e5eb6701eb5581b5fe3468a3870e9c6098d5 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Sun, 8 Sep 2024 23:32:36 +0200
Subject: [PATCH 03/26] f/ca

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index c1e64aa..a12fadb 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -211,30 +211,6 @@ _spcd_txt_pick() {
 # │ p = public │
 # ╰────────────╯
 
-spcd_ca() {
-    local grep="\(After\|Before\|Issuer\|Signature Algorithm\|Subject:\)"
-    local index name value
-    local root="${2}"
-    while true; do
-        index=$((index + 1))
-        name="SPCD_CA_${index}"
-        eval "value=\"\${${name}}\""
-        [ -n "${value}" ] || break
-        case "${1}" in
-        "list")
-            echo "${name} ="
-            echo "${value}" |
-                openssl x509 -noout -text |
-                grep "${grep}"
-            ;;
-        "write")
-            spcd_os_write "${root}/${index}.crt" "${value}"
-            ;;
-        *) ;;
-        esac
-    done
-}
-
 spcd_run() {
     if [ -n "${1}" ]; then
         _spcd_frame_open "${@}"
@@ -401,7 +377,7 @@ SPCD_PM_ZYPPER="zypper"
 # ╰───┴───────────╯
 
 spcd_step__environment_print() {
-    spcd_ca "list"
+    spcd_f_ca "list"
     spcd_f_dns "list"
     set -- \
         "GIT_RWX" \
@@ -840,6 +816,30 @@ spcd_python_pip() {
 # │ f │ ca = certificate authorities │
 # ╰───┴──────────────────────────────╯
 
+spcd_f_ca() {
+    local grep="\(After\|Before\|Issuer\|Signature Algorithm\|Subject:\)"
+    local index name value
+    local root="${2}"
+    while true; do
+        index=$((index + 1))
+        name="SPCD_CA_${index}"
+        eval "value=\"\${${name}}\""
+        [ -n "${value}" ] || break
+        case "${1}" in
+        "list")
+            echo "${name} ="
+            echo "${value}" |
+                openssl x509 -noout -text |
+                grep "${grep}"
+            ;;
+        "write")
+            spcd_os_write "${root}/${index}.crt" "${value}"
+            ;;
+        *) ;;
+        esac
+    done
+}
+
 spcd_f_ca_install() {
     spcd_step "Install package"
     spcd_f_pm_pkg_install "ca-certificates"
@@ -883,7 +883,7 @@ spcd_f_ca_write() {
     *) ;;
     esac
     spcd_os_mkdir "${root}"
-    spcd_ca "write" "${root}"
+    spcd_f_ca "write" "${root}"
 }
 
 # ╭───┬──────────────────────╮

From 0c050ca1ae6f3586e97c695b359c804be40d74f2 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Sun, 8 Sep 2024 23:49:16 +0200
Subject: [PATCH 04/26] pm/pkg/install

---
 spcd/bootstrap.sh | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index a12fadb..6003e74 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -890,14 +890,6 @@ spcd_f_ca_write() {
 # │ f │ pm = package manager │
 # ╰───┴──────────────────────╯
 
-spcd_f_pm_install() {
-    spcd_step "Install tools"
-    case "${SPCD_PM}" in
-    "${SPCD_PM_APT}") spcd_f_pm_pkg_install "apt-utils" ;;
-    *) ;;
-    esac
-}
-
 # ╭───┬────┬───────╮
 # │ f │ pm │ https │
 # ╰───┴────┴───────╯
@@ -967,15 +959,27 @@ spcd_f_pm_pkg_clean() {
 }
 
 spcd_f_pm_pkg_install() {
-    case "${SPCD_PM}" in
-    "${SPCD_PM_APK}") spcd_run apk add "${1}" ;;
-    "${SPCD_PM_APT}") spcd_run apt-get install --assume-yes "${1}" ;;
-    "${SPCD_PM_DNF}") spcd_run dnf install --assumeyes "${1}" ;;
-    "${SPCD_PM_PACMAN}") spcd_run pacman --sync --noconfirm "${1}" ;;
-    "${SPCD_PM_ZYPPER}") spcd_run zypper --non-interactive install "${1}" ;;
-    *) ;;
-    esac
-    spcd_f_pm_pkg_clean
+    if [ -n "${1}" ]; then
+        local name
+        for name in "${@}"; do
+            case "${SPCD_PM}" in
+            "${SPCD_PM_APK}") spcd_run apk add "${1}" ;;
+            "${SPCD_PM_APT}") spcd_run apt-get install --assume-yes "${1}" ;;
+            "${SPCD_PM_DNF}") spcd_run dnf install --assumeyes "${1}" ;;
+            "${SPCD_PM_PACMAN}") spcd_run pacman --sync --noconfirm "${1}" ;;
+            "${SPCD_PM_ZYPPER}")
+                spcd_run zypper --non-interactive install "${1}"
+                ;;
+            *) ;;
+            esac
+            spcd_f_pm_pkg_clean
+        done
+    else
+        case "${SPCD_PM}" in
+        "${SPCD_PM_APT}") spcd_f_pm_pkg_install "apt-utils" ;;
+        *) ;;
+        esac
+    fi
 }
 
 spcd_f_pm_pkg_query() {
@@ -1570,7 +1574,7 @@ spcd_main() {
     spcd_step__packages_set_configuration
     spcd_f_pm_https_trust
     spcd_f_pm_pkg_update
-    spcd_f_pm_install
+    spcd_f_pm_pkg_install
     # locales
     spcd_step_in "Locales"
     spcd_step "Install"

From e8011a6413d06f7b33139e4f237e43aa70658cb1 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Sun, 8 Sep 2024 23:57:03 +0200
Subject: [PATCH 05/26] env/workspace

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 6003e74..c3911e8 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -737,11 +737,6 @@ ${SPCD_PYTHON_VENV}/lib/${SPCD_PYTHON_COMMAND}/site-packages"
     spcd_os_printenv "SPCD_DL"
 }
 
-spcd_step__environment_list_workspace() {
-    spcd_step "List workspace"
-    spcd_os_ls "$(realpath .)"
-}
-
 # ╭──────────────╮
 # │ f = function │
 # ╰──────────────╯
@@ -886,6 +881,14 @@ spcd_f_ca_write() {
     spcd_f_ca "write" "${root}"
 }
 
+# ╭───┬───────────────────╮
+# │ f │ env = environment │
+# ╰───┴───────────────────╯
+
+spcd_f_env_workspace() {
+    spcd_os_ls "$(realpath .)"
+}
+
 # ╭───┬──────────────────────╮
 # │ f │ pm = package manager │
 # ╰───┴──────────────────────╯
@@ -1563,7 +1566,8 @@ spcd_main() {
     spcd_step__environment_print
     spcd_step_out
     spcd_step__environment_set_variables
-    spcd_step__environment_list_workspace
+    spcd_step "List workspace"
+    spcd_f_env_workspace
     spcd_step_out
     # dns
     spcd_step "DNS"

From 46860fd69dc7ab43d031e3096a94912fbd5ef176 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Sun, 8 Sep 2024 23:58:41 +0200
Subject: [PATCH 06/26] f/git

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index c3911e8..cbc4f8a 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -889,6 +889,10 @@ spcd_f_env_workspace() {
     spcd_os_ls "$(realpath .)"
 }
 
+# ╭───┬─────╮
+# │ f │ git │
+# ╰───┴─────╯
+
 # ╭───┬──────────────────────╮
 # │ f │ pm = package manager │
 # ╰───┴──────────────────────╯

From d83231c2fcdb2c589f974088c44076e4a214d59b Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Sun, 8 Sep 2024 23:59:33 +0200
Subject: [PATCH 07/26] mv

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index cbc4f8a..44445fe 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -765,27 +765,6 @@ nameserver ${value}
     fi
 }
 
-spcd_git_clone() {
-    if [ -n "${1}" ]; then
-        local name path url
-        name="$(basename "${1}")"
-        path="${SPCD_DL}/${name}"
-        url="$(spcd_git_url "${1}")"
-        git clone "${url}" "${path}"
-        echo "${path}"
-    fi
-}
-
-spcd_git_url() {
-    if [ -n "${1}" ]; then
-        case "${1}" in
-        http*) echo "${1}" ;;
-        */*) echo "${SPCD_PROJECT_ROOT}/${1}" ;;
-        *) echo "${SPCD_PROJECT_ROOT}/${SPCD_PROJECT_PATH}/${1}" ;;
-        esac
-    fi
-}
-
 spcd_python_ln() {
     local command="${1}"
     if [ -n "${command}" ]; then
@@ -893,6 +872,27 @@ spcd_f_env_workspace() {
 # │ f │ git │
 # ╰───┴─────╯
 
+spcd_git_clone() {
+    if [ -n "${1}" ]; then
+        local name path url
+        name="$(basename "${1}")"
+        path="${SPCD_DL}/${name}"
+        url="$(spcd_git_url "${1}")"
+        git clone "${url}" "${path}"
+        echo "${path}"
+    fi
+}
+
+spcd_git_url() {
+    if [ -n "${1}" ]; then
+        case "${1}" in
+        http*) echo "${1}" ;;
+        */*) echo "${SPCD_PROJECT_ROOT}/${1}" ;;
+        *) echo "${SPCD_PROJECT_ROOT}/${SPCD_PROJECT_PATH}/${1}" ;;
+        esac
+    fi
+}
+
 # ╭───┬──────────────────────╮
 # │ f │ pm = package manager │
 # ╰───┴──────────────────────╯

From 7b2a026b1e2403686f6934fd0dfa22e35a027be0 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 00:00:26 +0200
Subject: [PATCH 08/26] git/url

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 44445fe..a628e4f 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -877,13 +877,13 @@ spcd_git_clone() {
         local name path url
         name="$(basename "${1}")"
         path="${SPCD_DL}/${name}"
-        url="$(spcd_git_url "${1}")"
+        url="$(spcd_f_git_url "${1}")"
         git clone "${url}" "${path}"
         echo "${path}"
     fi
 }
 
-spcd_git_url() {
+spcd_f_git_url() {
     if [ -n "${1}" ]; then
         case "${1}" in
         http*) echo "${1}" ;;

From 8c9880693fe2503402fabef8e36dcc9fcc528ffe Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 00:01:20 +0200
Subject: [PATCH 09/26] git/clone

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index a628e4f..21e092b 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -778,7 +778,7 @@ spcd_python_pip() {
     if [ -n "${1}" ]; then
         local name path target
         name="$(basename "${1}")"
-        path="$(spcd_git_clone "${1}")"
+        path="$(spcd_f_git_clone "${1}")"
         path="${path}/${name}"
         target="${SPCD_PYTHON_VENV_PACKAGES}"
         cp --recursive "${path}" "${target}"
@@ -872,7 +872,7 @@ spcd_f_env_workspace() {
 # │ f │ git │
 # ╰───┴─────╯
 
-spcd_git_clone() {
+spcd_f_git_clone() {
     if [ -n "${1}" ]; then
         local name path url
         name="$(basename "${1}")"

From f3a6a848d513e3b81455a8eed4cedf3fc04a9309 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 00:03:25 +0200
Subject: [PATCH 10/26] f/py

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 21e092b..715aa67 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1024,6 +1024,10 @@ spcd_f_pm_pkg_upgrade() {
     esac
 }
 
+# ╭───┬─────────────╮
+# │ f │ py = python │
+# ╰───┴─────────────╯
+
 # ╭───┬─────╮
 # │ f │ txt │
 # ╰───┴─────╯

From 992d79c125e835caa2d7d045fa784a4c5175c7b5 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 00:04:20 +0200
Subject: [PATCH 11/26] mv

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 715aa67..dbe1e6c 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -765,27 +765,6 @@ nameserver ${value}
     fi
 }
 
-spcd_python_ln() {
-    local command="${1}"
-    if [ -n "${command}" ]; then
-        echo "→ ${SPCD_PYTHON_ALIAS} → ${command}"
-        ln -f -s "${command}" \
-            "/usr/bin/${SPCD_PYTHON_ALIAS}"
-    fi
-}
-
-spcd_python_pip() {
-    if [ -n "${1}" ]; then
-        local name path target
-        name="$(basename "${1}")"
-        path="$(spcd_f_git_clone "${1}")"
-        path="${path}/${name}"
-        target="${SPCD_PYTHON_VENV_PACKAGES}"
-        cp --recursive "${path}" "${target}"
-        echo "${target}/${name}"
-    fi
-}
-
 # ╭───┬──────────────────────────────╮
 # │ f │ ca = certificate authorities │
 # ╰───┴──────────────────────────────╯
@@ -1028,6 +1007,27 @@ spcd_f_pm_pkg_upgrade() {
 # │ f │ py = python │
 # ╰───┴─────────────╯
 
+spcd_python_ln() {
+    local command="${1}"
+    if [ -n "${command}" ]; then
+        echo "→ ${SPCD_PYTHON_ALIAS} → ${command}"
+        ln -f -s "${command}" \
+            "/usr/bin/${SPCD_PYTHON_ALIAS}"
+    fi
+}
+
+spcd_python_pip() {
+    if [ -n "${1}" ]; then
+        local name path target
+        name="$(basename "${1}")"
+        path="$(spcd_f_git_clone "${1}")"
+        path="${path}/${name}"
+        target="${SPCD_PYTHON_VENV_PACKAGES}"
+        cp --recursive "${path}" "${target}"
+        echo "${target}/${name}"
+    fi
+}
+
 # ╭───┬─────╮
 # │ f │ txt │
 # ╰───┴─────╯

From d8e681164d75bc74c48d41443083cbfbc3412864 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 00:05:42 +0200
Subject: [PATCH 12/26] py/link

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index dbe1e6c..0446a53 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1007,7 +1007,7 @@ spcd_f_pm_pkg_upgrade() {
 # │ f │ py = python │
 # ╰───┴─────────────╯
 
-spcd_python_ln() {
+spcd_f_py_link() {
     local command="${1}"
     if [ -n "${command}" ]; then
         echo "→ ${SPCD_PYTHON_ALIAS} → ${command}"
@@ -1396,7 +1396,7 @@ spcd_step__python_install() {
     spcd_step "Install package"
     spcd_f_pm_pkg_install "${SPCD_PYTHON_PACKAGE}"
     spcd_step "Link alias to command"
-    spcd_python_ln "${SPCD_PYTHON_COMMAND}"
+    spcd_f_py_link "${SPCD_PYTHON_COMMAND}"
     # venv
     spcd_step_in "Virtual environment"
     spcd_step "Install package"

From ce9e4de199f7df3340c84aa7a1ec7a2d084e3887 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 00:08:32 +0200
Subject: [PATCH 13/26] py/clone

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 0446a53..2f7c5b0 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1016,7 +1016,7 @@ spcd_f_py_link() {
     fi
 }
 
-spcd_python_pip() {
+spcd_f_py_clone() {
     if [ -n "${1}" ]; then
         local name path target
         name="$(basename "${1}")"
@@ -1426,7 +1426,7 @@ spcd_step__python_modules() {
     spcd_step "List"
     spcd_os_ls "${target}"
     spcd_step "Main"
-    path="$(spcd_python_pip "${SPCD_GIT_SPCD}")"
+    path="$(spcd_f_py_clone "${SPCD_GIT_SPCD}")"
     # check matching of file and variable
     spcd_step "Check"
     script="${path}/bootstrap.sh"
@@ -1439,7 +1439,7 @@ spcd_step__python_modules() {
     ls -l "${script}"
     "${_SPCD_CMD_SUM}" -c "${check}" || spcd_error_ci "SPCD"
     spcd_step "Root"
-    spcd_python_pip "${SPCD_GIT_RWX}"
+    spcd_f_py_clone "${SPCD_GIT_RWX}"
     spcd_step "List"
     spcd_os_ls "${target}"
     spcd_step_out

From fb95806a0b3405bd4d7c4a03e569f680a5d51741 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 00:09:06 +0200
Subject: [PATCH 14/26] mv

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 2f7c5b0..34ef921 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1007,15 +1007,6 @@ spcd_f_pm_pkg_upgrade() {
 # │ f │ py = python │
 # ╰───┴─────────────╯
 
-spcd_f_py_link() {
-    local command="${1}"
-    if [ -n "${command}" ]; then
-        echo "→ ${SPCD_PYTHON_ALIAS} → ${command}"
-        ln -f -s "${command}" \
-            "/usr/bin/${SPCD_PYTHON_ALIAS}"
-    fi
-}
-
 spcd_f_py_clone() {
     if [ -n "${1}" ]; then
         local name path target
@@ -1028,6 +1019,15 @@ spcd_f_py_clone() {
     fi
 }
 
+spcd_f_py_link() {
+    local command="${1}"
+    if [ -n "${command}" ]; then
+        echo "→ ${SPCD_PYTHON_ALIAS} → ${command}"
+        ln -f -s "${command}" \
+            "/usr/bin/${SPCD_PYTHON_ALIAS}"
+    fi
+}
+
 # ╭───┬─────╮
 # │ f │ txt │
 # ╰───┴─────╯

From afa1314d1a618a22f8af579187ed93a0d5995caf Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 00:10:07 +0200
Subject: [PATCH 15/26] fix

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 34ef921..7ea81f9 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1185,9 +1185,9 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET}
     esac
 }
 
-# ╭───┬──────╮
+# ╭──────────╮
 # │ s = step │
-# ╰───┴──────╯
+# ╰──────────╯
 
 # ╭───┬──────────╮
 # │ s │ packages │

From a9e31fd7403c5b292ec8366836f0e87e6f0aeff8 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 00:15:57 +0200
Subject: [PATCH 16/26] py/save

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 7ea81f9..40e4c18 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1028,6 +1028,27 @@ spcd_f_py_link() {
     fi
 }
 
+spcd_f_py_save() {
+    spcd_step "Write module"
+    local variable value text index root
+    for variable in \
+        OS_ID OS_VERSION \
+        PROJECT_ROOT PROJECT_PATH PROJECT_NAME \
+        PYTHON_VENV_BINARIES PYTHON_VENV_PACKAGES \
+        OPEN DOWN VERT SPLT __UP SHUT; do
+        value="$(spcd_os_printenv "SPCD_${variable}")"
+        text="${text}${value}
+"
+    done
+    index=$((__SPCD_STEP_1_INDEX + 1))
+    for root in \
+        "${SPCD_PYTHON_PACKAGES}" "${SPCD_PYTHON_VENV_PACKAGES}"; do
+        spcd_os_write "${root}/env.py" "${text}
+SPCD_STEP = ${index}
+"
+    done
+}
+
 # ╭───┬─────╮
 # │ f │ txt │
 # ╰───┴─────╯
@@ -1526,27 +1547,6 @@ spcd_step__install_packages() {
     spcd_step_out
 }
 
-spcd_step__python_write_module() {
-    spcd_step "Write module"
-    local variable value text index root
-    for variable in \
-        OS_ID OS_VERSION \
-        PROJECT_ROOT PROJECT_PATH PROJECT_NAME \
-        PYTHON_VENV_BINARIES PYTHON_VENV_PACKAGES \
-        OPEN DOWN VERT SPLT __UP SHUT; do
-        value="$(spcd_os_printenv "SPCD_${variable}")"
-        text="${text}${value}
-"
-    done
-    index=$((__SPCD_STEP_1_INDEX + 1))
-    for root in \
-        "${SPCD_PYTHON_PACKAGES}" "${SPCD_PYTHON_VENV_PACKAGES}"; do
-        spcd_os_write "${root}/env.py" "${text}
-SPCD_STEP = ${index}
-"
-    done
-}
-
 spcd_step__python_switch() {
     spcd_step "Switch"
     local name path
@@ -1616,7 +1616,7 @@ spcd_main() {
     spcd_step__python_install
     spcd_step__python_modules
     spcd_step__install_packages
-    spcd_step__python_write_module
+    spcd_f_py_save
     spcd_step__python_switch
 }
 

From acec3522fae09e3d2232529810f49e402ae9dc07 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 00:19:43 +0200
Subject: [PATCH 17/26] py/switch

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 40e4c18..4d61239 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1049,6 +1049,18 @@ SPCD_STEP = ${index}
     done
 }
 
+spcd_f_py_switch() {
+    spcd_step "Switch"
+    local name path
+    name="$(basename "${SPCD_GIT_SPCD}")"
+    path="$(realpath "${0}")"
+    echo "\
+${path}
+↓
+${SPCD_PYTHON_ALIAS} / ${name}"
+    "${SPCD_PYTHON_ALIAS}" -m "${name}"
+}
+
 # ╭───┬─────╮
 # │ f │ txt │
 # ╰───┴─────╯
@@ -1547,18 +1559,6 @@ spcd_step__install_packages() {
     spcd_step_out
 }
 
-spcd_step__python_switch() {
-    spcd_step "Switch"
-    local name path
-    name="$(basename "${SPCD_GIT_SPCD}")"
-    path="$(realpath "${0}")"
-    echo "\
-${path}
-↓
-${SPCD_PYTHON_ALIAS} / ${name}"
-    "${SPCD_PYTHON_ALIAS}" -m "${name}"
-}
-
 # ╭──────╮
 # │ main │
 # ╰──────╯
@@ -1617,7 +1617,7 @@ spcd_main() {
     spcd_step__python_modules
     spcd_step__install_packages
     spcd_f_py_save
-    spcd_step__python_switch
+    spcd_f_py_switch
 }
 
 spcd_main

From 62ca47aab30426eca6efc4c981d43de8d0665f23 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 00:21:46 +0200
Subject: [PATCH 18/26] save

---
 spcd/bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 4d61239..c8161be 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1029,7 +1029,7 @@ spcd_f_py_link() {
 }
 
 spcd_f_py_save() {
-    spcd_step "Write module"
+    spcd_step "Save"
     local variable value text index root
     for variable in \
         OS_ID OS_VERSION \

From 5786944cf99658e7496b7e8852e383451dfc18ea Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 00:43:44 +0200
Subject: [PATCH 19/26] ca/write

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index c8161be..225178d 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -770,9 +770,32 @@ nameserver ${value}
 # ╰───┴──────────────────────────────╯
 
 spcd_f_ca() {
-    local grep="\(After\|Before\|Issuer\|Signature Algorithm\|Subject:\)"
     local index name value
-    local root="${2}"
+    case "${1}" in
+    "list")
+        local grep="\(After\|Before\|Issuer\|Signature Algorithm\|Subject:\)"
+        ;;
+    "write")
+        local root
+        case "${SPCD_OS_ID}" in
+        "${SPCD_OS_ALMA}" | "${SPCD_OS_FEDORA}" | "${SPCD_OS_ROCKY}")
+            root="/etc/pki/ca-trust/source/anchors"
+            ;;
+        "${SPCD_OS_ALPINE}" | "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}")
+            root="/usr/local/share/ca-certificates"
+            ;;
+        "${SPCD_OS_ARCH}")
+            root="/etc/ca-certificates/trust-source/anchors"
+            ;;
+        "${SPCD_OS_OPENSUSE}")
+            root="/etc/pki/trust/anchors"
+            ;;
+        *) ;;
+        esac
+        spcd_os_mkdir "${root}"
+        ;;
+    *) ;;
+    esac
     while true; do
         index=$((index + 1))
         name="SPCD_CA_${index}"
@@ -817,28 +840,6 @@ spcd_f_ca_update() {
     esac
 }
 
-spcd_f_ca_write() {
-    spcd_step "Write certificates"
-    local root
-    case "${SPCD_OS_ID}" in
-    "${SPCD_OS_ALMA}" | "${SPCD_OS_FEDORA}" | "${SPCD_OS_ROCKY}")
-        root="/etc/pki/ca-trust/source/anchors"
-        ;;
-    "${SPCD_OS_ALPINE}" | "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}")
-        root="/usr/local/share/ca-certificates"
-        ;;
-    "${SPCD_OS_ARCH}")
-        root="/etc/ca-certificates/trust-source/anchors"
-        ;;
-    "${SPCD_OS_OPENSUSE}")
-        root="/etc/pki/trust/anchors"
-        ;;
-    *) ;;
-    esac
-    spcd_os_mkdir "${root}"
-    spcd_f_ca "write" "${root}"
-}
-
 # ╭───┬───────────────────╮
 # │ f │ env = environment │
 # ╰───┴───────────────────╯
@@ -1600,7 +1601,7 @@ spcd_main() {
     # ca
     spcd_step_in "CA"
     spcd_f_ca_install
-    spcd_f_ca_write
+    spcd_f_ca "write"
     spcd_f_ca_update
     spcd_step_out
     # packages

From 19b7ad46756b40dbcc52c769caec2e19fbbe96f1 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 00:44:19 +0200
Subject: [PATCH 20/26] mv

---
 spcd/bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 225178d..1a843ce 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -770,7 +770,6 @@ nameserver ${value}
 # ╰───┴──────────────────────────────╯
 
 spcd_f_ca() {
-    local index name value
     case "${1}" in
     "list")
         local grep="\(After\|Before\|Issuer\|Signature Algorithm\|Subject:\)"
@@ -796,6 +795,7 @@ spcd_f_ca() {
         ;;
     *) ;;
     esac
+    local index name value
     while true; do
         index=$((index + 1))
         name="SPCD_CA_${index}"

From 0bb39456e2351cfbf41c722f8f92cc1d95c0106d Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 00:46:16 +0200
Subject: [PATCH 21/26] indent

---
 spcd.sh | 55 +++++++++++++++++++++++++++----------------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/spcd.sh b/spcd.sh
index b0ef37c..76cb937 100755
--- a/spcd.sh
+++ b/spcd.sh
@@ -1,31 +1,30 @@
 #! /usr/bin/env sh
 
 gource \
---auto-skip-seconds 0.25 \
---date-format "%Y / %m / %d  ⋅  %H : %M : %S" \
---disable-input \
---font-scale 2.5 \
---frameless \
---hide mouse,usernames \
---highlight-dirs \
---key \
---multi-sampling \
---output-framerate 60 \
---output-ppm-stream - \
---seconds-per-day 0.6 \
---stop-at-end \
---viewport "1920x1080" \
-| \
-ffmpeg \
--codec:v ppm \
--format image2pipe \
--framerate 120 \
--i - \
--codec:v libx264 \
--preset veryslow \
--qp 28 \
--movflags \
-+faststart \
--pix_fmt yuv420p \
--y \
-spcd.mp4
+    --auto-skip-seconds 0.25 \
+    --date-format "%Y / %m / %d  ⋅  %H : %M : %S" \
+    --disable-input \
+    --font-scale 2.5 \
+    --frameless \
+    --hide mouse,usernames \
+    --highlight-dirs \
+    --key \
+    --multi-sampling \
+    --output-framerate 60 \
+    --output-ppm-stream - \
+    --seconds-per-day 0.6 \
+    --stop-at-end \
+    --viewport "1920x1080" |
+    ffmpeg \
+        -codec:v ppm \
+        -format image2pipe \
+        -framerate 120 \
+        -i - \
+        -codec:v libx264 \
+        -preset veryslow \
+        -qp 28 \
+        -movflags \
+        +faststart \
+        -pix_fmt yuv420p \
+        -y \
+        spcd.mp4

From 59105a0c54f6355437d3a358299e8729e749a2fd Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 00:48:56 +0200
Subject: [PATCH 22/26] py/install

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 1a843ce..3bda802 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1020,6 +1020,33 @@ spcd_f_py_clone() {
     fi
 }
 
+spcd_f_py_install() {
+    spcd_step "Install package"
+    spcd_f_pm_pkg_install "${SPCD_PYTHON_PACKAGE}"
+    spcd_step "Link alias to command"
+    spcd_f_py_link "${SPCD_PYTHON_COMMAND}"
+    # venv
+    spcd_step_in "Virtual environment"
+    spcd_step "Install package"
+    case "${SPCD_OS_ID}" in
+    "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}")
+        spcd_f_pm_pkg_install "python3-venv"
+        ;;
+    *) ;;
+    esac
+    spcd_step "Configure PIP"
+    spcd_os_write "/etc/pip.conf" "\
+[global]
+index-url = ${SPCD_URL_PYTHON}/simple
+"
+    spcd_step "Create"
+    "${SPCD_PYTHON_ALIAS}" -m "venv" "${SPCD_PYTHON_VENV}"
+    spcd_step "Activate"
+    export PATH="${SPCD_PYTHON_VENV_BINARIES}:${PATH}"
+    export VIRTUAL_ENV="${SPCD_PYTHON_VENV}"
+    spcd_step_out
+}
+
 spcd_f_py_link() {
     local command="${1}"
     if [ -n "${command}" ]; then
@@ -1426,33 +1453,6 @@ spcd_step__packages_install_git() {
 # │ s │ python │
 # ╰───┴────────╯
 
-spcd_step__python_install() {
-    spcd_step "Install package"
-    spcd_f_pm_pkg_install "${SPCD_PYTHON_PACKAGE}"
-    spcd_step "Link alias to command"
-    spcd_f_py_link "${SPCD_PYTHON_COMMAND}"
-    # venv
-    spcd_step_in "Virtual environment"
-    spcd_step "Install package"
-    case "${SPCD_OS_ID}" in
-    "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}")
-        spcd_f_pm_pkg_install "python3-venv"
-        ;;
-    *) ;;
-    esac
-    spcd_step "Configure PIP"
-    spcd_os_write "/etc/pip.conf" "\
-[global]
-index-url = ${SPCD_URL_PYTHON}/simple
-"
-    spcd_step "Create"
-    "${SPCD_PYTHON_ALIAS}" -m "venv" "${SPCD_PYTHON_VENV}"
-    spcd_step "Activate"
-    export PATH="${SPCD_PYTHON_VENV_BINARIES}:${PATH}"
-    export VIRTUAL_ENV="${SPCD_PYTHON_VENV}"
-    spcd_step_out
-}
-
 spcd_step__python_modules() {
     spcd_step_in "Modules"
     local target path script check
@@ -1614,7 +1614,7 @@ spcd_main() {
     spcd_step_out
     # python
     spcd_step_in "Python"
-    spcd_step__python_install
+    spcd_f_py_install
     spcd_step__python_modules
     spcd_step__install_packages
     spcd_f_py_save

From 373f5ef236f4118e3056f2b5fe1c7669a2aff3dd Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 00:55:49 +0200
Subject: [PATCH 23/26] f/pkg

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 3bda802..6477eaf 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -765,6 +765,87 @@ nameserver ${value}
     fi
 }
 
+spcd_f_pkg() {
+    spcd_step_in "OS packages"
+    local file
+    # epel
+    spcd_step "EPEL"
+    case "${SPCD_OS_ID}" in
+    "${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}")
+        spcd_f_pm_pkg_install "epel-release"
+        case "${SPCD_OS_VERSION}" in
+        "9")
+            set -- \
+                "-testing" \
+                ""
+            ;;
+        "8")
+            set -- \
+                "-modular" \
+                "-testing-modular" \
+                "-testing" \
+                ""
+            ;;
+        *) ;;
+        esac
+        for file in "${@}"; do
+            spcd_os_sed "/etc/yum.repos.d/epel${file}.repo" \
+                "|^metalink|#metalink|" \
+                "|https://download.example/pub/epel|${SPCD_URL_EPEL}|" \
+                "|^#baseurl|baseurl|"
+        done
+        file="/etc/yum.repos.d/epel-cisco-openh264.repo"
+        if [ -f "${file}" ]; then
+            spcd_os_sed "${file}" \
+                "|^enabled=1|enabled=0|"
+        fi
+        ;;
+    *) ;;
+    esac
+    # graphviz
+    spcd_step "GraphViz"
+    spcd_f_pm_pkg_install "graphviz"
+    # openssh
+    spcd_step "OpenSSH"
+    case "${SPCD_PM}" in
+    "${SPCD_PM_APK}" | "${SPCD_PM_APT}")
+        spcd_f_pm_pkg_install "openssh-client"
+        ;;
+    "${SPCD_PM_DNF}" | "${SPCD_PM_ZYPPER}")
+        spcd_f_pm_pkg_install "openssh-clients"
+        ;;
+    "${SPCD_PM_PACMAN}") spcd_f_pm_pkg_install "openssh" ;;
+    *) ;;
+    esac
+    # plantuml
+    spcd_step "PlantUML"
+    spcd_f_pm_pkg_install "plantuml"
+    # rsync
+    spcd_step "Rsync"
+    spcd_f_pm_pkg_install "rsync"
+    # shell check
+    spcd_step "ShellCheck"
+    case "${SPCD_PM}" in
+    "${SPCD_PM_DNF}" | "${SPCD_PM_ZYPPER}")
+        spcd_f_pm_pkg_install "ShellCheck"
+        ;;
+    *) spcd_f_pm_pkg_install "shellcheck" ;;
+    esac
+    # shfmt
+    spcd_step "ShellFormat"
+    case "${SPCD_OS_ID}" in
+    "${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}") ;;
+    "${SPCD_OS_DEBIAN}")
+        case "${SPCD_OS_VERSION}" in
+        "bullseye") ;;
+        *) spcd_f_pm_pkg_install "shfmt" ;;
+        esac
+        ;;
+    *) spcd_f_pm_pkg_install "shfmt" ;;
+    esac
+    spcd_step_out
+}
+
 # ╭───┬──────────────────────────────╮
 # │ f │ ca = certificate authorities │
 # ╰───┴──────────────────────────────╯
@@ -1479,87 +1560,6 @@ spcd_step__python_modules() {
     spcd_step_out
 }
 
-spcd_step__install_packages() {
-    spcd_step_in "OS packages"
-    local file
-    # epel
-    spcd_step "EPEL"
-    case "${SPCD_OS_ID}" in
-    "${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}")
-        spcd_f_pm_pkg_install "epel-release"
-        case "${SPCD_OS_VERSION}" in
-        "9")
-            set -- \
-                "-testing" \
-                ""
-            ;;
-        "8")
-            set -- \
-                "-modular" \
-                "-testing-modular" \
-                "-testing" \
-                ""
-            ;;
-        *) ;;
-        esac
-        for file in "${@}"; do
-            spcd_os_sed "/etc/yum.repos.d/epel${file}.repo" \
-                "|^metalink|#metalink|" \
-                "|https://download.example/pub/epel|${SPCD_URL_EPEL}|" \
-                "|^#baseurl|baseurl|"
-        done
-        file="/etc/yum.repos.d/epel-cisco-openh264.repo"
-        if [ -f "${file}" ]; then
-            spcd_os_sed "${file}" \
-                "|^enabled=1|enabled=0|"
-        fi
-        ;;
-    *) ;;
-    esac
-    # graphviz
-    spcd_step "GraphViz"
-    spcd_f_pm_pkg_install "graphviz"
-    # openssh
-    spcd_step "OpenSSH"
-    case "${SPCD_PM}" in
-    "${SPCD_PM_APK}" | "${SPCD_PM_APT}")
-        spcd_f_pm_pkg_install "openssh-client"
-        ;;
-    "${SPCD_PM_DNF}" | "${SPCD_PM_ZYPPER}")
-        spcd_f_pm_pkg_install "openssh-clients"
-        ;;
-    "${SPCD_PM_PACMAN}") spcd_f_pm_pkg_install "openssh" ;;
-    *) ;;
-    esac
-    # plantuml
-    spcd_step "PlantUML"
-    spcd_f_pm_pkg_install "plantuml"
-    # rsync
-    spcd_step "Rsync"
-    spcd_f_pm_pkg_install "rsync"
-    # shell check
-    spcd_step "ShellCheck"
-    case "${SPCD_PM}" in
-    "${SPCD_PM_DNF}" | "${SPCD_PM_ZYPPER}")
-        spcd_f_pm_pkg_install "ShellCheck"
-        ;;
-    *) spcd_f_pm_pkg_install "shellcheck" ;;
-    esac
-    # shfmt
-    spcd_step "ShellFormat"
-    case "${SPCD_OS_ID}" in
-    "${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}") ;;
-    "${SPCD_OS_DEBIAN}")
-        case "${SPCD_OS_VERSION}" in
-        "bullseye") ;;
-        *) spcd_f_pm_pkg_install "shfmt" ;;
-        esac
-        ;;
-    *) spcd_f_pm_pkg_install "shfmt" ;;
-    esac
-    spcd_step_out
-}
-
 # ╭──────╮
 # │ main │
 # ╰──────╯
@@ -1616,7 +1616,7 @@ spcd_main() {
     spcd_step_in "Python"
     spcd_f_py_install
     spcd_step__python_modules
-    spcd_step__install_packages
+    spcd_f_pkg
     spcd_f_py_save
     spcd_f_py_switch
 }

From 5543b5de661a787b8970ae268f9524564a24b795 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 01:04:13 +0200
Subject: [PATCH 24/26] py/download

---
 spcd/bootstrap.sh | 58 ++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 6477eaf..ee0a381 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1101,6 +1101,32 @@ spcd_f_py_clone() {
     fi
 }
 
+spcd_f_py_download() {
+    spcd_step_in "Modules"
+    local target path script check
+    target="${SPCD_PYTHON_VENV_PACKAGES}"
+    spcd_step "List"
+    spcd_os_ls "${target}"
+    spcd_step "Main"
+    path="$(spcd_f_py_clone "${SPCD_GIT_SPCD}")"
+    # check matching of file and variable
+    spcd_step "Check"
+    script="${path}/bootstrap.sh"
+    ls -l "${script}"
+    check="${script}.${_SPCD_CMD_SUM}"
+    "${_SPCD_CMD_SUM}" "${script}" >"${check}"
+    printf "%s" "${SPCD}" >"${script}"
+    ls -l "${script}"
+    dos2unix "${script}"
+    ls -l "${script}"
+    "${_SPCD_CMD_SUM}" -c "${check}" || spcd_error_ci "SPCD"
+    spcd_step "Root"
+    spcd_f_py_clone "${SPCD_GIT_RWX}"
+    spcd_step "List"
+    spcd_os_ls "${target}"
+    spcd_step_out
+}
+
 spcd_f_py_install() {
     spcd_step "Install package"
     spcd_f_pm_pkg_install "${SPCD_PYTHON_PACKAGE}"
@@ -1530,36 +1556,6 @@ spcd_step__packages_install_git() {
     spcd_f_pm_pkg_install "git"
 }
 
-# ╭───┬────────╮
-# │ s │ python │
-# ╰───┴────────╯
-
-spcd_step__python_modules() {
-    spcd_step_in "Modules"
-    local target path script check
-    target="${SPCD_PYTHON_VENV_PACKAGES}"
-    spcd_step "List"
-    spcd_os_ls "${target}"
-    spcd_step "Main"
-    path="$(spcd_f_py_clone "${SPCD_GIT_SPCD}")"
-    # check matching of file and variable
-    spcd_step "Check"
-    script="${path}/bootstrap.sh"
-    ls -l "${script}"
-    check="${script}.${_SPCD_CMD_SUM}"
-    "${_SPCD_CMD_SUM}" "${script}" >"${check}"
-    printf "%s" "${SPCD}" >"${script}"
-    ls -l "${script}"
-    dos2unix "${script}"
-    ls -l "${script}"
-    "${_SPCD_CMD_SUM}" -c "${check}" || spcd_error_ci "SPCD"
-    spcd_step "Root"
-    spcd_f_py_clone "${SPCD_GIT_RWX}"
-    spcd_step "List"
-    spcd_os_ls "${target}"
-    spcd_step_out
-}
-
 # ╭──────╮
 # │ main │
 # ╰──────╯
@@ -1615,7 +1611,7 @@ spcd_main() {
     # python
     spcd_step_in "Python"
     spcd_f_py_install
-    spcd_step__python_modules
+    spcd_f_py_download
     spcd_f_pkg
     spcd_f_py_save
     spcd_f_py_switch

From c2459552e35fe743effc66f389662c2d835712ca Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 01:09:19 +0200
Subject: [PATCH 25/26] f/pkg

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index ee0a381..d12e5e5 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -954,6 +954,20 @@ spcd_f_git_url() {
     fi
 }
 
+# ╭───┬───────────────╮
+# │ f │ pkg = package │
+# ╰───┴───────────────╯
+
+spcd_f_pkg_dos2unix() {
+    spcd_step "Install dos2unix"
+    spcd_f_pm_pkg_install "dos2unix"
+}
+
+spcd_f_pkg_git() {
+    spcd_step "Install Git"
+    spcd_f_pm_pkg_install "git"
+}
+
 # ╭───┬──────────────────────╮
 # │ f │ pm = package manager │
 # ╰───┴──────────────────────╯
@@ -1542,20 +1556,6 @@ Dir::Etc::SourceParts \"\";
     esac
 }
 
-# ╭───┬──────────╮
-# │ s │ packages │
-# ╰───┴──────────╯
-
-spcd_step__packages_install_dos2unix() {
-    spcd_step "Install dos2unix"
-    spcd_f_pm_pkg_install "dos2unix"
-}
-
-spcd_step__packages_install_git() {
-    spcd_step "Install Git"
-    spcd_f_pm_pkg_install "git"
-}
-
 # ╭──────╮
 # │ main │
 # ╰──────╯
@@ -1605,8 +1605,8 @@ spcd_main() {
     spcd_f_pm_https_verify
     spcd_f_pm_pkg_update
     spcd_f_pm_pkg_upgrade
-    spcd_step__packages_install_dos2unix
-    spcd_step__packages_install_git
+    spcd_f_pkg_dos2unix
+    spcd_f_pkg_git
     spcd_step_out
     # python
     spcd_step_in "Python"

From 86d07730bc2e5e7652937b130b8d94e12943dec3 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 9 Sep 2024 01:11:27 +0200
Subject: [PATCH 26/26] step/packages

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index d12e5e5..dbb40a5 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1367,13 +1367,9 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET}
     esac
 }
 
-# ╭──────────╮
-# │ s = step │
-# ╰──────────╯
-
-# ╭───┬──────────╮
-# │ s │ packages │
-# ╰───┴──────────╯
+# ╭──────┬──────────╮
+# │ step │ packages │
+# ╰──────┴──────────╯
 
 spcd_step__packages_set_repositories() {
     spcd_step "Set repositories"