From f27e5adbd38d6498e39d2f234882d7188459fb84 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 29 Apr 2024 22:41:28 +0200 Subject: [PATCH 1/7] repos --- cd.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/cd.sh b/cd.sh index 4717b24..7777146 100644 --- a/cd.sh +++ b/cd.sh @@ -112,6 +112,8 @@ local text="" } cd_set_packages_repositories () { +local expression +local file cd_step "Set packages repositories" case "${CD_OS_NAME}" in "debian") @@ -122,7 +124,15 @@ deb https://deb.debian.org/debian bookworm-updates main deb https://deb.debian.org/debian-security bookworm-security main " ;; - "alma") echo "TODO" ;; + "alma") + file="/etc/yum.repos.d/almalinux.repo" + for expression in \ + "|^m|# m|" \ + "|^# b|b|" \ + ; do + sed --in-place "s${expression}g" "${file}" || exit + done + ;; *) cd_error_os "cd_set_packages_repositories" ;; esac } From dac01bb13b3fc30ffc58184135c6f56baf953f4b Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 29 Apr 2024 22:43:51 +0200 Subject: [PATCH 2/7] cd_cat --- cd.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/cd.sh b/cd.sh index 7777146..9af56b4 100644 --- a/cd.sh +++ b/cd.sh @@ -132,6 +132,7 @@ deb https://deb.debian.org/debian-security bookworm-security main ; do sed --in-place "s${expression}g" "${file}" || exit done + cd_cat "${file}" ;; *) cd_error_os "cd_set_packages_repositories" ;; esac From 3de8ea1b230987c3125df5d8d181e295d5d1947f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 29 Apr 2024 23:07:52 +0200 Subject: [PATCH 3/7] cd_sed --- cd.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/cd.sh b/cd.sh index 9af56b4..60e36e1 100644 --- a/cd.sh +++ b/cd.sh @@ -126,12 +126,7 @@ deb https://deb.debian.org/debian-security bookworm-security main ;; "alma") file="/etc/yum.repos.d/almalinux.repo" - for expression in \ - "|^m|# m|" \ - "|^# b|b|" \ - ; do - sed --in-place "s${expression}g" "${file}" || exit - done + cd_sed "${file}" "|^m|# m|" "|^# b|b|" cd_cat "${file}" ;; *) cd_error_os "cd_set_packages_repositories" ;; @@ -337,6 +332,18 @@ cd_rm () { fi } +cd_sed () { +local expression +local file + if [ -f "${1}" ] ; then + file="${1}" + shift + for expression in "${@}" ; do + sed --in-place "s${expression}g" "${file}" || exit + done + fi +} + cd_step () { if [ "${1}" ] ; then CD_STEP=$((CD_STEP+1)) From 292d5e0c9e616ce3f61594004d8a075a1c2d6057 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Tue, 30 Apr 2024 12:30:08 +0200 Subject: [PATCH 4/7] cd_write_ca --- cd.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/cd.sh b/cd.sh index 60e36e1..7ea99ee 100644 --- a/cd.sh +++ b/cd.sh @@ -18,7 +18,7 @@ cd_main () { cd_update_packages_catalog cd_install_packages_tools cd_install_ca - cd_copy_ca + cd_write_ca cd_update_ca cd_set_https_verification_on cd_update_packages_catalog @@ -191,15 +191,23 @@ cd_install_ca () { cd_install_package "${CD_CA_PACKAGE}" } -cd_copy_ca () { +cd_write_ca () { +local index local target +local text cd_step "Copy CA" case "${CD_OS_NAME}" in "debian") target="/usr/local/share/ca-certificates" ;; "alma") target="/etc/pki/ca-trust/source/anchors" ;; *) cd_error_os "cd_copy_ca" ;; esac - echo "TODO" + index=1 + eval "text=\${CD_CA_${index}}" + while [ "${text}" ] ; do + cd_write "${target}/${index}.crt" "${text}" + index=$((index+1)) + eval "text=\${CD_CA_${index}}" + done } cd_update_ca () { From 1998b57e899a18e86dce5cc1826f9098d823cddb Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Tue, 30 Apr 2024 12:31:56 +0200 Subject: [PATCH 5/7] _certificates --- cd.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cd.sh b/cd.sh index 7ea99ee..99764141 100644 --- a/cd.sh +++ b/cd.sh @@ -17,9 +17,9 @@ cd_main () { cd_set_https_verification_off cd_update_packages_catalog cd_install_packages_tools - cd_install_ca - cd_write_ca - cd_update_ca + cd_install_ca_certificates + cd_write_ca_certificates + cd_update_ca_certificates cd_set_https_verification_on cd_update_packages_catalog cd_upgrade_packages @@ -186,12 +186,12 @@ cd_install_packages_tools () { esac } -cd_install_ca () { +cd_install_ca_certificates () { cd_step "Install CA" cd_install_package "${CD_CA_PACKAGE}" } -cd_write_ca () { +cd_write_ca_certificates () { local index local target local text @@ -210,7 +210,7 @@ local text done } -cd_update_ca () { +cd_update_ca_certificates () { cd_step "Update CA" case "${CD_OS_NAME}" in "debian") update-ca-certificates || exit ;; From 54dd37f1c32aae7da4fdc3b3e03b1bfbc7fa9f70 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Tue, 30 Apr 2024 12:36:33 +0200 Subject: [PATCH 6/7] split,step --- cd.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cd.sh b/cd.sh index 99764141..0fa61f8 100644 --- a/cd.sh +++ b/cd.sh @@ -352,13 +352,19 @@ local file fi } +cd_split () { + echo -n "\ +╶─╌╌┄┄┈┈ +" +} + cd_step () { if [ "${1}" ] ; then CD_STEP=$((CD_STEP+1)) echo -n "\ -╭─╌┄┈ +╭─╌╌┄┄┈┈ │ ${CD_STEP} ${1} -╰─╌┄┈ +╰─╌╌┄┄┈┈ " fi } From 8739a7be34a4a741087bcf495edb9c53cbf76f62 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Tue, 30 Apr 2024 13:15:13 +0200 Subject: [PATCH 7/7] alma/9 --- cd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cd.sh b/cd.sh index 0fa61f8..eb54620 100644 --- a/cd.sh +++ b/cd.sh @@ -47,7 +47,7 @@ cd_set_environment () { ;; "alma") case "${CD_OS_VERSION}" in - "8") + "8"|"9") CD_PYTHON_PACKAGE="python3.11" CD_PYTHON_PACKAGES="/usr/lib64/python3.11/site-packages" ;;