From 958fb45c0915cd858585910341d903f6d5eca792 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 19:52:24 +0200 Subject: [PATCH 1/7] ca/install --- spcd/bootstrap.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index b6eaf31..876c449 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -836,6 +836,15 @@ spcd_python_pip() { fi } +# ╭───┬──────────────────────────────╮ +# │ f │ ca = certificate authorities │ +# ╰───┴──────────────────────────────╯ + +spcd_f_ca_install() { + spcd_step "Install package" + spcd_f_pm_pkg_install "ca-certificates" +} + # ╭───┬──────────────────────╮ # │ f │ pm = package manager │ # ╰───┴──────────────────────╯ @@ -1329,11 +1338,6 @@ spcd_step__packages_install_locales() { # │ s │ ca │ # ╰───┴────╯ -spcd_step__ca_install_package() { - spcd_step "Install package" - spcd_f_pm_pkg_install "ca-certificates" -} - spcd_step__ca_write_certificates() { spcd_step "Write certificates" local root @@ -1590,7 +1594,7 @@ spcd_main() { spcd_step_out # ca spcd_step_in "CA" - spcd_step__ca_install_package + spcd_f_ca_install spcd_step__ca_write_certificates spcd_step__ca_update_certificates spcd_step_out From 8797e27dad09773b2879052ab8378c3c8f3ccd72 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 20:31:35 +0200 Subject: [PATCH 2/7] ca/update --- spcd/bootstrap.sh | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 876c449..273fbbf 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -845,6 +845,25 @@ spcd_f_ca_install() { spcd_f_pm_pkg_install "ca-certificates" } +spcd_f_ca_update() { + spcd_step "Update certificates" + case "${SPCD_OS_ID}" in + "${SPCD_OS_ARCH}" | \ + "${SPCD_OS_ALMA}" | \ + "${SPCD_OS_FEDORA}" | \ + "${SPCD_OS_ROCKY}") + spcd_run update-ca-trust + ;; + "${SPCD_OS_ALPINE}" | \ + "${SPCD_OS_DEBIAN}" | \ + "${SPCD_OS_OPENSUSE}" | \ + "${SPCD_OS_UBUNTU}") + spcd_run update-ca-certificates + ;; + *) ;; + esac +} + # ╭───┬──────────────────────╮ # │ f │ pm = package manager │ # ╰───┴──────────────────────╯ @@ -1360,25 +1379,6 @@ spcd_step__ca_write_certificates() { spcd_ca "write" "${root}" } -spcd_step__ca_update_certificates() { - spcd_step "Update certificates" - case "${SPCD_OS_ID}" in - "${SPCD_OS_ARCH}" | \ - "${SPCD_OS_ALMA}" | \ - "${SPCD_OS_FEDORA}" | \ - "${SPCD_OS_ROCKY}") - spcd_run update-ca-trust - ;; - "${SPCD_OS_ALPINE}" | \ - "${SPCD_OS_DEBIAN}" | \ - "${SPCD_OS_OPENSUSE}" | \ - "${SPCD_OS_UBUNTU}") - spcd_run update-ca-certificates - ;; - *) ;; - esac -} - # ╭───┬──────────╮ # │ s │ packages │ # ╰───┴──────────╯ @@ -1596,7 +1596,7 @@ spcd_main() { spcd_step_in "CA" spcd_f_ca_install spcd_step__ca_write_certificates - spcd_step__ca_update_certificates + spcd_f_ca_update spcd_step_out # packages spcd_step_in "Packages" From 126de92af4c6acc1f3caf8a05c1c345a359680a5 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 20:33:43 +0200 Subject: [PATCH 3/7] ca/write --- spcd/bootstrap.sh | 50 ++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 273fbbf..34fc5f8 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -864,6 +864,28 @@ 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_ca "write" "${root}" +} + # ╭───┬──────────────────────╮ # │ f │ pm = package manager │ # ╰───┴──────────────────────╯ @@ -1353,32 +1375,6 @@ spcd_step__packages_install_locales() { spcd_step_out } -# ╭───┬────╮ -# │ s │ ca │ -# ╰───┴────╯ - -spcd_step__ca_write_certificates() { - 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_ca "write" "${root}" -} - # ╭───┬──────────╮ # │ s │ packages │ # ╰───┴──────────╯ @@ -1595,7 +1591,7 @@ spcd_main() { # ca spcd_step_in "CA" spcd_f_ca_install - spcd_step__ca_write_certificates + spcd_f_ca_write spcd_f_ca_update spcd_step_out # packages From 2696514c246304fd12d3d94b1cb010a475c36d90 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 20:45:29 +0200 Subject: [PATCH 4/7] pm/install --- spcd/bootstrap.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 34fc5f8..3e5c52a 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -890,6 +890,14 @@ 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 │ # ╰───┴────┴───────╯ @@ -1356,14 +1364,6 @@ Dir::Etc::SourceParts \"\"; esac } -spcd_step__packages_install_tools() { - spcd_step "Install tools" - case "${SPCD_PM}" in - "${SPCD_PM_APT}") spcd_f_pm_pkg_install "apt-utils" ;; - *) ;; - esac -} - spcd_step__packages_install_locales() { spcd_step_in "Locales" spcd_step "Install" @@ -1585,7 +1585,7 @@ spcd_main() { spcd_step__packages_set_configuration spcd_f_pm_https_trust spcd_f_pm_pkg_update - spcd_step__packages_install_tools + spcd_f_pm_install spcd_step__packages_install_locales spcd_step_out # ca From 6db5bcec5cf9b17111d8c2689fccfcc07d7f35a1 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 20:53:43 +0200 Subject: [PATCH 5/7] e --- spcd/bootstrap.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 3e5c52a..478994e 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -397,12 +397,12 @@ spcd_txt_get() { esac } -# ╭──────────╮ -# │ s = step │ -# ╰──────────╯ +# ╭─────────────────╮ +# │ e = environment │ +# ╰─────────────────╯ # ╭───┬───────────╮ -# │ s │ constants │ +# │ e │ constants │ # ╰───┴───────────╯ SPCD_OS_ALMA="alma" @@ -420,9 +420,9 @@ SPCD_PM_DNF="dnf" SPCD_PM_PACMAN="pacman" SPCD_PM_ZYPPER="zypper" -# ╭───┬─────────────╮ -# │ s │ environment │ -# ╰───┴─────────────╯ +# ╭───┬───────────╮ +# │ e │ functions │ +# ╰───┴───────────╯ spcd_step__environment_print() { spcd_ca "list" @@ -1170,6 +1170,10 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} esac } +# ╭───┬──────╮ +# │ s = step │ +# ╰───┴──────╯ + # ╭───┬─────╮ # │ s │ dns │ # ╰───┴─────╯ From 39707ac621a2847683193cd3eee9e5d81f46c32c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 20:54:37 +0200 Subject: [PATCH 6/7] task --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index da899c0..b0915df 100644 --- a/readme.md +++ b/readme.md @@ -240,6 +240,7 @@ Handle project workflows in a unified way: * locales * persist * test +* workspace variable #### Shell → Python From 58192fa9f8e458164abb3155af2fcc57986db36f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 21:13:57 +0200 Subject: [PATCH 7/7] steps/locales --- spcd/bootstrap.sh | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 478994e..c0061ce 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1368,17 +1368,6 @@ Dir::Etc::SourceParts \"\"; esac } -spcd_step__packages_install_locales() { - spcd_step_in "Locales" - spcd_step "Install" - spcd_f_txt_locales "install" - spcd_step "Set" - spcd_f_txt_locale "set" "${SPCD_TXT_LOCALE}" - spcd_step "Show" - spcd_f_txt_locale "show" - spcd_step_out -} - # ╭───┬──────────╮ # │ s │ packages │ # ╰───┴──────────╯ @@ -1590,7 +1579,15 @@ spcd_main() { spcd_f_pm_https_trust spcd_f_pm_pkg_update spcd_f_pm_install - spcd_step__packages_install_locales + # locales + spcd_step_in "Locales" + spcd_step "Install" + spcd_f_txt_locales "install" + spcd_step "Set" + spcd_f_txt_locale "set" "${SPCD_TXT_LOCALE}" + spcd_step "Show" + spcd_f_txt_locale "show" + spcd_step_out spcd_step_out # ca spcd_step_in "CA"