From 3a58be34e025da351689961538ebcb38dc7c2dfa Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 19 Aug 2024 14:15:29 +0200 Subject: [PATCH 1/5] mv --- spcd.sh | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/spcd.sh b/spcd.sh index a48ff51..ad425f4 100644 --- a/spcd.sh +++ b/spcd.sh @@ -605,6 +605,28 @@ spcd_install_python() { spcd_install_package "${SPCD_PYTHON_PACKAGE}" spcd_split spcd_ln_python "${SPCD_PYTHON_COMMAND}" + # TODO move to Python + spcd_step "Install Python virtual environment" + case "${SPCD_OS_ID}" in + "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}") + spcd_install_package "python3-venv" + ;; + "${SPCD_OS_ARCH}") + # FIXME arch + exit 255 + ;; + *) ;; + esac + spcd_split + spcd_write "/etc/pip.conf" "\ +[global] +index-url = ${SPCD_URL_PYTHON} +" + spcd_split + "${SPCD_PYTHON_ALIAS}" -m "venv" "${SPCD_PYTHON_VENV}" + spcd_split + export PATH="${SPCD_PYTHON_VENV_BINARIES}:${PATH}" + export VIRTUAL_ENV="${SPCD_PYTHON_VENV}" } spcd_install_python_modules() { @@ -704,28 +726,6 @@ spcd_install_packages() { "${SPCD_PM_PACMAN}") spcd_install_package "openssh" ;; *) ;; esac - # venv - spcd_step "Install Python virtual environment" - case "${SPCD_OS_ID}" in - "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}") - spcd_install_package "python3-venv" - ;; - "${SPCD_OS_ARCH}") - # FIXME arch - exit 255 - ;; - *) ;; - esac - spcd_split - spcd_write "/etc/pip.conf" "\ -[global] -index-url = ${SPCD_URL_PYTHON} -" - spcd_split - "${SPCD_PYTHON_ALIAS}" -m "venv" "${SPCD_PYTHON_VENV}" - spcd_split - export PATH="${SPCD_PYTHON_VENV_BINARIES}:${PATH}" - export VIRTUAL_ENV="${SPCD_PYTHON_VENV}" } spcd_write_python_module() { From e52764c8bf0c79b705cb4eec3b04fbb44e78bf33 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 19 Aug 2024 14:27:10 +0200 Subject: [PATCH 2/5] spcd_cmd_sum --- readme.md | 15 ++++++++++----- spcd.sh | 7 ++++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/readme.md b/readme.md index 0fa11f1..db778e6 100644 --- a/readme.md +++ b/readme.md @@ -45,6 +45,7 @@ from various contexts of CA, CI and OCI / OS. | SPCD_BRANCH_STAGING | Staging deployment branch | dev | | SPCD_BRANCH_FEATURE | Feature deployment branch | f | | SPCD_CA_n | Numbered CA certificates | | +| SPCD_CMD_SUM | Command to check sums | sha512sum | | SPCD_DNS_n | Numbered name servers | 9.9.9.9 | | SPCD_GIT_MAIN | Main Git repository | spcd | | SPCD_GIT_ROOT | Root Git repository | rwx | @@ -87,7 +88,15 @@ from various contexts of CA, CI and OCI / OS. * relay environment module name * write tests -### .py +### sh + +* support opensuse + +### sh → py + +* check file & variable sums + +### py * detect ssh private key type * implement project repository cloning @@ -102,7 +111,3 @@ from various contexts of CA, CI and OCI / OS. * lint * .py * .sh - -### .sh - -* support opensuse diff --git a/spcd.sh b/spcd.sh index ad425f4..24d6d2e 100644 --- a/spcd.sh +++ b/spcd.sh @@ -4,6 +4,7 @@ [ -n "${SPCD_BRANCH_RELEASE}" ] || SPCD_BRANCH_RELEASE="main" [ -n "${SPCD_BRANCH_STAGING}" ] || SPCD_BRANCH_STAGING="dev" [ -n "${SPCD_BRANCH_FEATURE}" ] || SPCD_BRANCH_FEATURE="f" +[ -n "${SPCD_CMD_SUM}" ] || SPCD_CMD_SUM="sha512sum" [ -n "${SPCD_DNS_1}" ] || SPCD_DNS_1="9.9.9.9" [ -n "${SPCD_GIT_MAIN}" ] || SPCD_GIT_MAIN="spcd" [ -n "${SPCD_GIT_ROOT}" ] || SPCD_GIT_ROOT="rwx" @@ -661,13 +662,13 @@ ${spcd_ipm__target}" spcd_ipm__script="${spcd_ipm__root}/${spcd_ipm__name}/spcd.sh" if [ -f "${spcd_ipm__script}" ]; then spcd_split - spcd_ipm__check="${spcd_ipm__root}/check.sha512sum" - sha512sum "${spcd_ipm__script}" >"${spcd_ipm__check}" + spcd_ipm__check="${spcd_ipm__root}/check.${SPCD_CMD_SUM}" + "${SPCD_CMD_SUM}" "${spcd_ipm__script}" >"${spcd_ipm__check}" printf "%s" "${SPCD}" >"${spcd_ipm__script}" ls -l "${spcd_ipm__script}" dos2unix "${spcd_ipm__script}" ls -l "${spcd_ipm__script}" - sha512sum -c "${spcd_ipm__check}" || spcd_error_ci "SPCD" + "${SPCD_CMD_SUM}" -c "${spcd_ipm__check}" || spcd_error_ci "SPCD" fi done spcd_split From 4d5ed3faedffcbfe819e75a50f97dfad35d0bece Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 19 Aug 2024 14:32:00 +0200 Subject: [PATCH 3/5] arch/venv --- readme.md | 4 +++- spcd.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index db778e6..91e34c2 100644 --- a/readme.md +++ b/readme.md @@ -90,7 +90,9 @@ from various contexts of CA, CI and OCI / OS. ### sh -* support opensuse +* support + * arch python virtual environment + * opensuse operating system ### sh → py diff --git a/spcd.sh b/spcd.sh index 24d6d2e..c1ad737 100644 --- a/spcd.sh +++ b/spcd.sh @@ -613,7 +613,7 @@ spcd_install_python() { spcd_install_package "python3-venv" ;; "${SPCD_OS_ARCH}") - # FIXME arch + echo "Not supported!" exit 255 ;; *) ;; From 5593c26dedd827a0bd6bab7357c1d103503d8e86 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 19 Aug 2024 14:38:39 +0200 Subject: [PATCH 4/5] tasks/venv --- readme.md | 6 ++++++ spcd.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 91e34c2..191072f 100644 --- a/readme.md +++ b/readme.md @@ -97,6 +97,12 @@ from various contexts of CA, CI and OCI / OS. ### sh → py * check file & variable sums +* python virtual environment + * install system package + * configure pip + * venv + * create + * activate ### py diff --git a/spcd.sh b/spcd.sh index c1ad737..7842a87 100644 --- a/spcd.sh +++ b/spcd.sh @@ -606,7 +606,7 @@ spcd_install_python() { spcd_install_package "${SPCD_PYTHON_PACKAGE}" spcd_split spcd_ln_python "${SPCD_PYTHON_COMMAND}" - # TODO move to Python + # venv spcd_step "Install Python virtual environment" case "${SPCD_OS_ID}" in "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}") From a376f1b1489f8b8438bd1fba2471a3d9aa6095da Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 19 Aug 2024 14:43:46 +0200 Subject: [PATCH 5/5] tasks/pkg --- readme.md | 16 ++++++++-------- spcd.sh | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/readme.md b/readme.md index 191072f..a42983a 100644 --- a/readme.md +++ b/readme.md @@ -97,6 +97,14 @@ from various contexts of CA, CI and OCI / OS. ### sh → py * check file & variable sums +* install system packages + * epel + * plantuml + * shellcheck + * graphviz + * openssh + * rsync + * shfmt * python virtual environment * install system package * configure pip @@ -108,14 +116,6 @@ from various contexts of CA, CI and OCI / OS. * detect ssh private key type * implement project repository cloning -* install - * epel - * plantuml - * shellcheck - * graphviz - * openssh - * rsync - * shfmt * lint * .py * .sh diff --git a/spcd.sh b/spcd.sh index 7842a87..7557cd7 100644 --- a/spcd.sh +++ b/spcd.sh @@ -33,7 +33,6 @@ spcd_main() { spcd_install_git spcd_install_python spcd_install_python_modules - # TODO move to Python spcd_install_packages spcd_write_python_module spcd_switch_to_python @@ -677,7 +676,6 @@ ${spcd_ipm__target}" spcd_rm "${spcd_ipm__root}" } -# TODO move to Python spcd_install_packages() { # epel spcd_step "Install EPEL"