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