From 5d34df1bfeba799fd54bd16c3c2abe013b8f6b52 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 17:02:59 +0200
Subject: [PATCH 01/15] switch/path

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 137ac96..36f62ed 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -514,9 +514,6 @@ ${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")"
     #
     spcd_os_printenv "SPCD_PROJECT_BRANCH" \
         "SPCD_PROJECT_ROOT" "SPCD_PROJECT_PATH" "SPCD_PROJECT_NAME"
-    # set path
-    SPCD_PATH="$(realpath "${0}")"
-    spcd_os_printenv "SPCD_PATH"
     # set operating system id
     SPCD_OS_ID="$(spcd_os_grep ID)"
     case "${SPCD_OS_ID}" in
@@ -1223,8 +1220,9 @@ SPCD_STEP = ${spcd_wpm__index}
 spcd_python_switch() {
     spcd_step "Switch"
     spcd_stp__name="$(basename "${SPCD_GIT_MAIN}")"
+    spcd_stp__path="$(realpath "${0}")"
     echo "\
-${SPCD_PATH}
+${spcd_stp__path}
 ↓
 ${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}"
     "${SPCD_PYTHON_ALIAS}" -m "${spcd_stp__name}"

From 2995362c3df0911c2e18e3fa82e7333be5ceb2e0 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 17:07:05 +0200
Subject: [PATCH 02/15] python3

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 36f62ed..0f5d619 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -781,7 +781,7 @@ Acquire::https::Verify-Peer False;
         SPCD_PYTHON_PACKAGES="/usr/lib/${SPCD_PYTHON_COMMAND}/site-packages"
         ;;
     "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}")
-        SPCD_PYTHON_PACKAGES="/usr/lib/${SPCD_PYTHON_ALIAS}/dist-packages"
+        SPCD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages"
         ;;
     *) ;;
     esac

From d22986d284feed6e0a9e517b39460cb55e7e09ab Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 17:14:50 +0200
Subject: [PATCH 03/15] resolv

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 0f5d619..667ffbb 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -592,10 +592,9 @@ ${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")"
     spcd_split
     spcd_os_printenv "SPCD_OS_ID" "SPCD_OS_VERSION"
     # universal
-    SPCD_DNS_FILE="/etc/resolv.conf"
     SPCD_PYTHON_ALIAS="python3"
     spcd_split
-    spcd_os_printenv "SPCD_DNS_FILE" "SPCD_PYTHON_ALIAS"
+    spcd_os_printenv "SPCD_PYTHON_ALIAS"
     # set package manager
     case "${SPCD_OS_ID}" in
     "${SPCD_OS_ALPINE}")
@@ -853,7 +852,7 @@ spcd_dns() {
 nameserver ${spcd_sdr__value}
 "
     done
-    spcd_os_write "${SPCD_DNS_FILE}" "${spcd_sdr__text}"
+    spcd_os_write "/etc/resolv.conf" "${spcd_sdr__text}"
 }
 
 # ╭───────┬──────────╮

From d4a9f1c89e2baea03b775a35858d1f8f0bba771e Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 18:03:06 +0200
Subject: [PATCH 04/15] pip

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 667ffbb..6acf9a6 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -348,17 +348,6 @@ spcd_python_ln() {
     fi
 }
 
-spcd_python_pip() {
-    if [ -n "${1}" ]; then
-        spcd_pp__name="$(basename "${1}")"
-        spcd_pp__path="$(spcd_git_clone "${1}")"
-        spcd_pp__path="${spcd_pp__path}/${spcd_pp__name}"
-        spcd_pp__target="${SPCD_PYTHON_VENV_PACKAGES}"
-        cp --recursive "${spcd_pp__path}" "${spcd_pp__target}"
-        echo "${spcd_pp__target}/${spcd_pp__name}"
-    fi
-}
-
 # ╭───────────┬───────╮
 # │ functions │ split │
 # ╰───────────┴───────╯
@@ -827,6 +816,17 @@ spcd_install_package() {
     spcd_clean_cache
 }
 
+spcd_python_pip() {
+    if [ -n "${1}" ]; then
+        spcd_pp__name="$(basename "${1}")"
+        spcd_pp__path="$(spcd_git_clone "${1}")"
+        spcd_pp__path="${spcd_pp__path}/${spcd_pp__name}"
+        spcd_pp__target="${SPCD_PYTHON_VENV_PACKAGES}"
+        cp --recursive "${spcd_pp__path}" "${spcd_pp__target}"
+        echo "${spcd_pp__target}/${spcd_pp__name}"
+    fi
+}
+
 spcd_query_package() {
     case "${SPCD_PM}" in
     "${SPCD_PM_APK}") apk info "${1}" ;;

From deff26576fab8b6e3f22b4dbdb63fdfa759fa8e3 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 18:09:58 +0200
Subject: [PATCH 05/15] x509/1

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 6acf9a6..c5d4c86 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -257,10 +257,9 @@ spcd_git_url() {
 # ╰───────────┴─────────╯
 
 spcd_openssl_x509() {
-    spcd_openssl_x509__file="${1}"
-    if [ -f "${spcd_openssl_x509__file}" ]; then
+    if [ -f "${1}" ]; then
         openssl x509 \
-            -in "${spcd_openssl_x509__file}" \
+            -in "${1}" \
             -noout -text
     fi
 }

From 843378cdac4a2ca6b39364d2d7e6dadd128bc190 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 18:11:10 +0200
Subject: [PATCH 06/15] os/1

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index c5d4c86..8357d78 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -222,9 +222,8 @@ spcd_error_ci() {
 }
 
 spcd_error_os() {
-    spcd_error_os__variable="${1}"
     printf "× OS: "
-    spcd_os_printenv "${spcd_error_os__variable}"
+    spcd_os_printenv "${1}"
     exit "${_SPCD_ERROR_OS}"
 }
 

From 4ed549e0b9712e978373b42e130db51bd3401011 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 18:12:55 +0200
Subject: [PATCH 07/15] ls/1

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 8357d78..0fc5d24 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -276,11 +276,10 @@ spcd_os_grep() {
 }
 
 spcd_os_ls() {
-    spcd_os_ls__path="${1}"
-    if [ -n "${spcd_os_ls__path}" ]; then
-        _spcd_frame_open "${spcd_os_ls__path}"
-        ls -a -l "${spcd_os_ls__path}"
-        _spcd_frame_shut "${spcd_os_ls__path}"
+    if [ -n "${1}" ]; then
+        _spcd_frame_open "${1}"
+        ls -a -l "${1}"
+        _spcd_frame_shut "${1}"
     fi
 }
 

From f0965a46f99a4a3bd62adead0d9ccd69aaf7b305 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 18:13:39 +0200
Subject: [PATCH 08/15] mkdir/1

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 0fc5d24..ebc521e 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -284,10 +284,9 @@ spcd_os_ls() {
 }
 
 spcd_os_mkdir() {
-    spcd_os_mkdir__path="${1}"
-    if [ -n "${spcd_os_mkdir__path}" ]; then
-        echo "→ ${spcd_os_mkdir__path}"
-        mkdir --parents "${spcd_os_mkdir__path}"
+    if [ -n "${1}" ]; then
+        echo "→ ${1}"
+        mkdir --parents "${1}"
     fi
 }
 

From 9214a5f1b33584baaeb879f73b48cdb2ecb8c92a Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 18:14:26 +0200
Subject: [PATCH 09/15] mkdir

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index ebc521e..509dd58 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -284,10 +284,8 @@ spcd_os_ls() {
 }
 
 spcd_os_mkdir() {
-    if [ -n "${1}" ]; then
-        echo "→ ${1}"
-        mkdir --parents "${1}"
-    fi
+    echo "→ ${1}"
+    mkdir --parents "${1}"
 }
 
 spcd_os_printenv() {

From 0aabefd385c2ee6dea040652e17c7babebe29ccf Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 18:18:10 +0200
Subject: [PATCH 10/15] ln

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 509dd58..391d760 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -329,19 +329,6 @@ spcd_os_write() {
     fi
 }
 
-# ╭───────────┬────────╮
-# │ functions │ python │
-# ╰───────────┴────────╯
-
-spcd_python_ln() {
-    spcd_python_ln__command="${1}"
-    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}"
-    fi
-}
-
 # ╭───────────┬───────╮
 # │ functions │ split │
 # ╰───────────┴───────╯
@@ -810,6 +797,15 @@ spcd_install_package() {
     spcd_clean_cache
 }
 
+spcd_python_ln() {
+    spcd_python_ln__command="${1}"
+    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}"
+    fi
+}
+
 spcd_python_pip() {
     if [ -n "${1}" ]; then
         spcd_pp__name="$(basename "${1}")"

From 8246b28512a812873a13e3a3814d587f72942564 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 18:18:41 +0200
Subject: [PATCH 11/15] python

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 391d760..7e62dc8 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -562,7 +562,7 @@ ${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")"
     spcd_split
     spcd_os_printenv "SPCD_OS_ID" "SPCD_OS_VERSION"
     # universal
-    SPCD_PYTHON_ALIAS="python3"
+    SPCD_PYTHON_ALIAS="python"
     spcd_split
     spcd_os_printenv "SPCD_PYTHON_ALIAS"
     # set package manager

From 971dce2adaddbc59280ee0c49cda6f342815a3ed Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 18:20:47 +0200
Subject: [PATCH 12/15] mv

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 7e62dc8..96fb05f 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -561,10 +561,6 @@ ${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")"
     esac
     spcd_split
     spcd_os_printenv "SPCD_OS_ID" "SPCD_OS_VERSION"
-    # universal
-    SPCD_PYTHON_ALIAS="python"
-    spcd_split
-    spcd_os_printenv "SPCD_PYTHON_ALIAS"
     # set package manager
     case "${SPCD_OS_ID}" in
     "${SPCD_OS_ALPINE}")
@@ -685,7 +681,8 @@ Acquire::https::Verify-Peer False;
     esac
     spcd_split
     spcd_os_printenv "SPCD_URL_DEFAULT" "SPCD_URL_CHOSEN"
-    # set python command & package
+    # set python alias, command & package
+    SPCD_PYTHON_ALIAS="python"
     case "${SPCD_OS_ID}" in
     "${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}")
         SPCD_PYTHON_COMMAND="python3.12"
@@ -739,7 +736,8 @@ Acquire::https::Verify-Peer False;
     *) ;;
     esac
     spcd_split
-    spcd_os_printenv "SPCD_PYTHON_COMMAND" "SPCD_PYTHON_PACKAGE"
+    spcd_os_printenv "SPCD_PYTHON_ALIAS" \
+        "SPCD_PYTHON_COMMAND" "SPCD_PYTHON_PACKAGE"
     # set python packages
     case "${SPCD_OS_ID}" in
     "${SPCD_OS_ALMA}" | "${SPCD_OS_FEDORA}" | "${SPCD_OS_ROCKY}" | \

From f4f4d4c5b6ed7ad9d1e89fbb997fd597771e6432 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 18:23:53 +0200
Subject: [PATCH 13/15] pm

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 96fb05f..047380c 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -580,9 +580,9 @@ ${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")"
         ;;
     *) ;;
     esac
-    # set package manager variables
     spcd_split
     spcd_os_printenv "SPCD_PM"
+    # set package manager variables
     case "${SPCD_PM}" in
     "${SPCD_PM_DNF}")
         SPCD_PM_HTTPS_PATH="/etc/dnf/dnf.conf.d/https.conf"

From 336bee85e25b815a22e9dbb8843e0eab0ec95b95 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 18:27:58 +0200
Subject: [PATCH 14/15] venv

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 047380c..d320d31 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -386,9 +386,6 @@ SPCD_PM_DNF="dnf"
 SPCD_PM_PACMAN="pacman"
 SPCD_PM_ZYPPER="zypper"
 
-SPCD_PYTHON_VENV="/opt/venv"
-SPCD_PYTHON_VENV_BINARIES="${SPCD_PYTHON_VENV}/bin"
-
 # ╭───────┬─────────────╮
 # │ steps │ environment │
 # ╰───────┴─────────────╯
@@ -752,6 +749,9 @@ Acquire::https::Verify-Peer False;
         ;;
     *) ;;
     esac
+    # set python virtual environment
+    SPCD_PYTHON_VENV="/opt/venv"
+    SPCD_PYTHON_VENV_BINARIES="${SPCD_PYTHON_VENV}/bin"
     SPCD_PYTHON_VENV_PACKAGES="\
 ${SPCD_PYTHON_VENV}/lib/${SPCD_PYTHON_COMMAND}/site-packages"
     spcd_split

From 26af1a60ff2911998b7c83b93bd4cdfc4dc74fee Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 26 Aug 2024 18:31:23 +0200
Subject: [PATCH 15/15] alias

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

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index d320d31..0e1ce38 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -678,8 +678,11 @@ Acquire::https::Verify-Peer False;
     esac
     spcd_split
     spcd_os_printenv "SPCD_URL_DEFAULT" "SPCD_URL_CHOSEN"
-    # set python alias, command & package
-    SPCD_PYTHON_ALIAS="python"
+    # set python alias
+    SPCD_PYTHON_ALIAS="python3"
+    spcd_split
+    spcd_os_printenv "SPCD_PYTHON_ALIAS"
+    # set python command & package
     case "${SPCD_OS_ID}" in
     "${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}")
         SPCD_PYTHON_COMMAND="python3.12"
@@ -733,8 +736,7 @@ Acquire::https::Verify-Peer False;
     *) ;;
     esac
     spcd_split
-    spcd_os_printenv "SPCD_PYTHON_ALIAS" \
-        "SPCD_PYTHON_COMMAND" "SPCD_PYTHON_PACKAGE"
+    spcd_os_printenv "SPCD_PYTHON_COMMAND" "SPCD_PYTHON_PACKAGE"
     # set python packages
     case "${SPCD_OS_ID}" in
     "${SPCD_OS_ALMA}" | "${SPCD_OS_FEDORA}" | "${SPCD_OS_ROCKY}" | \
@@ -745,7 +747,7 @@ Acquire::https::Verify-Peer False;
         SPCD_PYTHON_PACKAGES="/usr/lib/${SPCD_PYTHON_COMMAND}/site-packages"
         ;;
     "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}")
-        SPCD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages"
+        SPCD_PYTHON_PACKAGES="/usr/lib/${SPCD_PYTHON_ALIAS}/dist-packages"
         ;;
     *) ;;
     esac