From 95c3e169710edc93c4f03453f9722e3a9a1e9987 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Tue, 18 Jun 2024 14:43:55 +0200 Subject: [PATCH 01/21] readme/checkboxes --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 30d85df..23e8484 100644 --- a/readme.md +++ b/readme.md @@ -21,10 +21,10 @@ from various contexts of CA, CI and OCI / OS. * [X] Alpine → Python 3.11 * [X] 3.18 * [X] 3.19 - * [X] Arch → Python 3.12 + * [ ] Arch → Python 3.12 * [ ] 20231112 * [X] 20240101 - * [X] Debian + * [ ] Debian * [ ] Bullseye (11) → Python 3.9 * [X] Bookworm (12) → Python 3.11 * [X] Fedora → Python 3.12 From a49364305f98c7718b7fb04a71add608972974f6 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 20 Jun 2024 21:34:54 +0200 Subject: [PATCH 02/21] =?UTF-8?q?:=20=E2=86=92=20=5F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .forgejo/workflows/{almalinux:8.yaml => almalinux_8.yaml} | 0 .forgejo/workflows/{almalinux:9.yaml => almalinux_9.yaml} | 0 .forgejo/workflows/{alpine:3.18.yaml => alpine_3.18.yaml} | 0 .forgejo/workflows/{alpine:3.19.yaml => alpine_3.19.yaml} | 0 ...231112.0.191179.yaml => archlinux_base-20231112.0.191179.yaml} | 0 ...240101.0.204074.yaml => archlinux_base-20240101.0.204074.yaml} | 0 .forgejo/workflows/{debian:bookworm.yaml => debian_bookworm.yaml} | 0 .forgejo/workflows/{debian:bullseye.yaml => debian_bullseye.yaml} | 0 .forgejo/workflows/{fedora:39.yaml => fedora_39.yaml} | 0 .forgejo/workflows/{fedora:40.yaml => fedora_40.yaml} | 0 .forgejo/workflows/{rockylinux:8.yaml => rockylinux_8.yaml} | 0 .forgejo/workflows/{rockylinux:9.yaml => rockylinux_9.yaml} | 0 .forgejo/workflows/{ubuntu:jammy.yaml => ubuntu_jammy.yaml} | 0 .forgejo/workflows/{ubuntu:noble.yaml => ubuntu_noble.yaml} | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename .forgejo/workflows/{almalinux:8.yaml => almalinux_8.yaml} (100%) rename .forgejo/workflows/{almalinux:9.yaml => almalinux_9.yaml} (100%) rename .forgejo/workflows/{alpine:3.18.yaml => alpine_3.18.yaml} (100%) rename .forgejo/workflows/{alpine:3.19.yaml => alpine_3.19.yaml} (100%) rename .forgejo/workflows/{archlinux:base-20231112.0.191179.yaml => archlinux_base-20231112.0.191179.yaml} (100%) rename .forgejo/workflows/{archlinux:base-20240101.0.204074.yaml => archlinux_base-20240101.0.204074.yaml} (100%) rename .forgejo/workflows/{debian:bookworm.yaml => debian_bookworm.yaml} (100%) rename .forgejo/workflows/{debian:bullseye.yaml => debian_bullseye.yaml} (100%) rename .forgejo/workflows/{fedora:39.yaml => fedora_39.yaml} (100%) rename .forgejo/workflows/{fedora:40.yaml => fedora_40.yaml} (100%) rename .forgejo/workflows/{rockylinux:8.yaml => rockylinux_8.yaml} (100%) rename .forgejo/workflows/{rockylinux:9.yaml => rockylinux_9.yaml} (100%) rename .forgejo/workflows/{ubuntu:jammy.yaml => ubuntu_jammy.yaml} (100%) rename .forgejo/workflows/{ubuntu:noble.yaml => ubuntu_noble.yaml} (100%) diff --git a/.forgejo/workflows/almalinux:8.yaml b/.forgejo/workflows/almalinux_8.yaml similarity index 100% rename from .forgejo/workflows/almalinux:8.yaml rename to .forgejo/workflows/almalinux_8.yaml diff --git a/.forgejo/workflows/almalinux:9.yaml b/.forgejo/workflows/almalinux_9.yaml similarity index 100% rename from .forgejo/workflows/almalinux:9.yaml rename to .forgejo/workflows/almalinux_9.yaml diff --git a/.forgejo/workflows/alpine:3.18.yaml b/.forgejo/workflows/alpine_3.18.yaml similarity index 100% rename from .forgejo/workflows/alpine:3.18.yaml rename to .forgejo/workflows/alpine_3.18.yaml diff --git a/.forgejo/workflows/alpine:3.19.yaml b/.forgejo/workflows/alpine_3.19.yaml similarity index 100% rename from .forgejo/workflows/alpine:3.19.yaml rename to .forgejo/workflows/alpine_3.19.yaml diff --git a/.forgejo/workflows/archlinux:base-20231112.0.191179.yaml b/.forgejo/workflows/archlinux_base-20231112.0.191179.yaml similarity index 100% rename from .forgejo/workflows/archlinux:base-20231112.0.191179.yaml rename to .forgejo/workflows/archlinux_base-20231112.0.191179.yaml diff --git a/.forgejo/workflows/archlinux:base-20240101.0.204074.yaml b/.forgejo/workflows/archlinux_base-20240101.0.204074.yaml similarity index 100% rename from .forgejo/workflows/archlinux:base-20240101.0.204074.yaml rename to .forgejo/workflows/archlinux_base-20240101.0.204074.yaml diff --git a/.forgejo/workflows/debian:bookworm.yaml b/.forgejo/workflows/debian_bookworm.yaml similarity index 100% rename from .forgejo/workflows/debian:bookworm.yaml rename to .forgejo/workflows/debian_bookworm.yaml diff --git a/.forgejo/workflows/debian:bullseye.yaml b/.forgejo/workflows/debian_bullseye.yaml similarity index 100% rename from .forgejo/workflows/debian:bullseye.yaml rename to .forgejo/workflows/debian_bullseye.yaml diff --git a/.forgejo/workflows/fedora:39.yaml b/.forgejo/workflows/fedora_39.yaml similarity index 100% rename from .forgejo/workflows/fedora:39.yaml rename to .forgejo/workflows/fedora_39.yaml diff --git a/.forgejo/workflows/fedora:40.yaml b/.forgejo/workflows/fedora_40.yaml similarity index 100% rename from .forgejo/workflows/fedora:40.yaml rename to .forgejo/workflows/fedora_40.yaml diff --git a/.forgejo/workflows/rockylinux:8.yaml b/.forgejo/workflows/rockylinux_8.yaml similarity index 100% rename from .forgejo/workflows/rockylinux:8.yaml rename to .forgejo/workflows/rockylinux_8.yaml diff --git a/.forgejo/workflows/rockylinux:9.yaml b/.forgejo/workflows/rockylinux_9.yaml similarity index 100% rename from .forgejo/workflows/rockylinux:9.yaml rename to .forgejo/workflows/rockylinux_9.yaml diff --git a/.forgejo/workflows/ubuntu:jammy.yaml b/.forgejo/workflows/ubuntu_jammy.yaml similarity index 100% rename from .forgejo/workflows/ubuntu:jammy.yaml rename to .forgejo/workflows/ubuntu_jammy.yaml diff --git a/.forgejo/workflows/ubuntu:noble.yaml b/.forgejo/workflows/ubuntu_noble.yaml similarity index 100% rename from .forgejo/workflows/ubuntu:noble.yaml rename to .forgejo/workflows/ubuntu_noble.yaml From 0702fae0e900b68c2bce6e99d0249d8fd6f23aa8 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 21 Jun 2024 12:10:09 +0200 Subject: [PATCH 03/21] main --- cd/__init__.py | 13 +++++++++++++ cd/__main__.py | 12 +----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/cd/__init__.py b/cd/__init__.py index ca3b9c8..9d776e7 100644 --- a/cd/__init__.py +++ b/cd/__init__.py @@ -3,12 +3,14 @@ __version__ = "0.0.1" import os +import sys from pathlib import Path import env from rwx import fs, ps from rwx.log import stream as log +import cd from cd.project import Project from cd.projects import Projects @@ -113,6 +115,17 @@ def install_commands(path: str) -> None: (user / f"{COMMANDS_PREFIX}{command}").symlink_to(path) +def main() -> None: + path, *arguments = sys.argv + name = Path(path).name + if name == "__main__.py": + cd.set_ssh(*arguments) + cd.install_commands(__file__) + else: + function = getattr(cd, name.replace("-", "_")) + function(*arguments) + + def set_ssh(*arguments: str) -> None: step("Set SSH") # diff --git a/cd/__main__.py b/cd/__main__.py index 520006a..bfad99f 100755 --- a/cd/__main__.py +++ b/cd/__main__.py @@ -2,17 +2,7 @@ """Entry point to either bootstrap or command.""" -import sys -from pathlib import Path - import cd if __name__ == "__main__": - path, *arguments = sys.argv - name = Path(path).name - if name == "__main__.py": - cd.set_ssh(*arguments) - cd.install_commands(__file__) - else: - function = getattr(cd, name.replace("-", "_")) - function(*arguments) + cd.main(__file__) From 5e12e3ae6ac2db523b3a6c8235deee00e054e669 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 21 Jun 2024 12:48:40 +0200 Subject: [PATCH 04/21] main/docstring --- cd/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cd/__main__.py b/cd/__main__.py index bfad99f..1ec83d5 100755 --- a/cd/__main__.py +++ b/cd/__main__.py @@ -1,6 +1,6 @@ #! /usr/bin/env python3 -"""Entry point to either bootstrap or command.""" +"""Entry point.""" import cd From c0079994e6bc8f1e19cbc26bba85f6280ac8227c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 21 Jun 2024 13:01:44 +0200 Subject: [PATCH 05/21] mv --- cd.sh => cidd.sh | 0 {cd => cidd}/__init__.py | 0 {cd => cidd}/__main__.py | 0 {cd => cidd}/project.py | 0 {cd => cidd}/projects.py | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename cd.sh => cidd.sh (100%) rename {cd => cidd}/__init__.py (100%) rename {cd => cidd}/__main__.py (100%) rename {cd => cidd}/project.py (100%) rename {cd => cidd}/projects.py (100%) diff --git a/cd.sh b/cidd.sh similarity index 100% rename from cd.sh rename to cidd.sh diff --git a/cd/__init__.py b/cidd/__init__.py similarity index 100% rename from cd/__init__.py rename to cidd/__init__.py diff --git a/cd/__main__.py b/cidd/__main__.py similarity index 100% rename from cd/__main__.py rename to cidd/__main__.py diff --git a/cd/project.py b/cidd/project.py similarity index 100% rename from cd/project.py rename to cidd/project.py diff --git a/cd/projects.py b/cidd/projects.py similarity index 100% rename from cd/projects.py rename to cidd/projects.py From 6aedbd3c7c896fbd14c96f1042e5732add22e94f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 21 Jun 2024 13:07:44 +0200 Subject: [PATCH 06/21] .py --- cidd/__init__.py | 40 ++++++++++++++++++++-------------------- cidd/__main__.py | 4 ++-- cidd/project.py | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/cidd/__init__.py b/cidd/__init__.py index 9d776e7..b735c80 100644 --- a/cidd/__init__.py +++ b/cidd/__init__.py @@ -1,4 +1,4 @@ -"""Continuous Deployment.""" +"""Continuous Integration, Delivery & Deployment.""" __version__ = "0.0.1" @@ -10,21 +10,21 @@ import env from rwx import fs, ps from rwx.log import stream as log -import cd -from cd.project import Project -from cd.projects import Projects +import cidd +from cidd.project import Project +from cidd.projects import Projects -COMMANDS_PREFIX = "cd-" +COMMANDS_PREFIX = "cidd-" projects = Projects() project = Project(projects) -def cd_browse_workspace() -> None: +def cidd_browse_workspace() -> None: browse(project.root) -def cd_build_project() -> None: +def cidd_build_project() -> None: for extension in ["py", "sh"]: path = Path(project.root) / f"build.{extension}" if path.exists(): @@ -34,7 +34,7 @@ def cd_build_project() -> None: pass -def cd_clone_branch() -> None: +def cidd_clone_branch() -> None: log.info(projects) split() log.info(project) @@ -58,12 +58,12 @@ def cd_clone_branch() -> None: ) -def cd_list_environment() -> None: +def cidd_list_environment() -> None: for variable, value in sorted(projects.environment.items()): log.info(f"{variable} = {value}") -def cd_synchronize() -> None: +def cidd_synchronize() -> None: host = "rwx.work" source = "out" user = "cd" @@ -119,10 +119,10 @@ def main() -> None: path, *arguments = sys.argv name = Path(path).name if name == "__main__.py": - cd.set_ssh(*arguments) - cd.install_commands(__file__) + cidd.set_ssh(*arguments) + cidd.install_commands(__file__) else: - function = getattr(cd, name.replace("-", "_")) + function = getattr(cidd, name.replace("-", "_")) function(*arguments) @@ -154,19 +154,19 @@ def set_ssh(*arguments: str) -> None: def frame(text: str) -> None: - log.info(f"{env.CD_OPEN}{text}") + log.info(f"{env.CIDD_OPEN}{text}") def shut(text: str) -> None: - log.info(f"{env.CD_SHUT}{text}") + log.info(f"{env.CIDD_SHUT}{text}") def split() -> None: - log.info(env.CD_SPLT) + log.info(env.CIDD_SPLT) def step(text: str) -> None: - env.CD_STEP += 1 - log.info(env.CD_DOWN) - log.info(f"{env.CD_VERT} {env.CD_STEP} {text}") - log.info(env.CD___UP) + env.CIDD_STEP += 1 + log.info(env.CIDD_DOWN) + log.info(f"{env.CIDD_VERT} {env.CIDD_STEP} {text}") + log.info(env.CIDD___UP) diff --git a/cidd/__main__.py b/cidd/__main__.py index 1ec83d5..2d29cea 100755 --- a/cidd/__main__.py +++ b/cidd/__main__.py @@ -2,7 +2,7 @@ """Entry point.""" -import cd +import cidd if __name__ == "__main__": - cd.main(__file__) + cidd.main(__file__) diff --git a/cidd/project.py b/cidd/project.py index d1244d9..787c97c 100644 --- a/cidd/project.py +++ b/cidd/project.py @@ -7,7 +7,7 @@ from typing import TYPE_CHECKING from urllib.parse import urljoin if TYPE_CHECKING: - from cd.projects import Projects + from cidd.projects import Projects BRANCH = [ "GITHUB_REF_NAME", From 5486b279a15eca89a07b3bf7688aa52780c84f3d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 21 Jun 2024 13:15:22 +0200 Subject: [PATCH 07/21] .sh/CIDD --- cidd.sh | 602 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 301 insertions(+), 301 deletions(-) diff --git a/cidd.sh b/cidd.sh index af48a0c..b5399a9 100644 --- a/cidd.sh +++ b/cidd.sh @@ -1,11 +1,11 @@ #! /usr/bin/env sh # defaults -[ -n "${CD_DNS}" ] || CD_DNS="\ +[ -n "${CIDD_DNS}" ] || CIDD_DNS="\ 9.9.9.9 \ " -[ -n "${CD_GIT_CHILD}" ] || CD_GIT_CHILD="cd" -[ -n "${CD_GIT_PARENT}" ] || CD_GIT_PARENT="rwx" +[ -n "${CIDD_GIT_CHILD}" ] || CIDD_GIT_CHILD="cd" +[ -n "${CIDD_GIT_PARENT}" ] || CIDD_GIT_PARENT="rwx" # main cd_main () { @@ -41,136 +41,136 @@ cd_main () { cd_set_environment_variables () { cd_step "Set environment variables" # set path - CD_PATH="$(realpath "${0}")" - cd_echo "CD_PATH" + CIDD_PATH="$(realpath "${0}")" + cd_echo "CIDD_PATH" # set operating system id - CD_OS_ID="$(cd_grep_os ID)" - case "${CD_OS_ID}" in - "almalinux") CD_OS_ID="${CD_OS_ALMA}" ;; - "alpine") CD_OS_ID="${CD_OS_ALPINE}" ;; - "arch") CD_OS_ID="${CD_OS_ARCH}" ;; - "debian") CD_OS_ID="${CD_OS_DEBIAN}" ;; - "fedora") CD_OS_ID="${CD_OS_FEDORA}" ;; - "rocky") CD_OS_ID="${CD_OS_ROCKY}" ;; - "ubuntu") CD_OS_ID="${CD_OS_UBUNTU}" ;; - *) cd_error_os "CD_OS_ID" ;; + CIDD_OS_ID="$(cd_grep_os ID)" + case "${CIDD_OS_ID}" in + "almalinux") CIDD_OS_ID="${CIDD_OS_ALMA}" ;; + "alpine") CIDD_OS_ID="${CIDD_OS_ALPINE}" ;; + "arch") CIDD_OS_ID="${CIDD_OS_ARCH}" ;; + "debian") CIDD_OS_ID="${CIDD_OS_DEBIAN}" ;; + "fedora") CIDD_OS_ID="${CIDD_OS_FEDORA}" ;; + "rocky") CIDD_OS_ID="${CIDD_OS_ROCKY}" ;; + "ubuntu") CIDD_OS_ID="${CIDD_OS_UBUNTU}" ;; + *) cd_error_os "CIDD_OS_ID" ;; esac # set operating system version - case "${CD_OS_ID}" in - "${CD_OS_ALMA}"|"${CD_OS_ARCH}"|"${CD_OS_FEDORA}"|"${CD_OS_ROCKY}") - CD_OS_VERSION=$(cd_grep_os VERSION_ID \ + case "${CIDD_OS_ID}" in + "${CIDD_OS_ALMA}"|"${CIDD_OS_ARCH}"|"${CIDD_OS_FEDORA}"|"${CIDD_OS_ROCKY}") + CIDD_OS_VERSION=$(cd_grep_os VERSION_ID \ | sed "s|^\([0-9]\+\)\..*|\1|") ;; - "${CD_OS_ALPINE}") - CD_OS_VERSION=$(cd_grep_os VERSION_ID \ + "${CIDD_OS_ALPINE}") + CIDD_OS_VERSION=$(cd_grep_os VERSION_ID \ | sed "s|^\([0-9]\+\.[0-9]\+\)\..*|\1|") ;; - "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") - CD_OS_VERSION="$(cd_grep_os VERSION_CODENAME)" + "${CIDD_OS_DEBIAN}"|"${CIDD_OS_UBUNTU}") + CIDD_OS_VERSION="$(cd_grep_os VERSION_CODENAME)" ;; *) esac # check operating system version - case "${CD_OS_ID}" in - "${CD_OS_ALMA}"|"${CD_OS_ROCKY}") - case "${CD_OS_VERSION}" in + case "${CIDD_OS_ID}" in + "${CIDD_OS_ALMA}"|"${CIDD_OS_ROCKY}") + case "${CIDD_OS_VERSION}" in "8"|"9") ;; - *) cd_error_os "CD_OS_VERSION" ;; + *) cd_error_os "CIDD_OS_VERSION" ;; esac ;; - "${CD_OS_ALPINE}") - case "${CD_OS_VERSION}" in + "${CIDD_OS_ALPINE}") + case "${CIDD_OS_VERSION}" in "3.18"|"3.19") ;; - *) cd_error_os "CD_OS_VERSION" ;; + *) cd_error_os "CIDD_OS_VERSION" ;; esac ;; - "${CD_OS_ARCH}") - case "${CD_OS_VERSION}" in + "${CIDD_OS_ARCH}") + case "${CIDD_OS_VERSION}" in "20231112"|"20240101") ;; - *) cd_error_os "CD_OS_VERSION" ;; + *) cd_error_os "CIDD_OS_VERSION" ;; esac ;; - "${CD_OS_DEBIAN}") - case "${CD_OS_VERSION}" in + "${CIDD_OS_DEBIAN}") + case "${CIDD_OS_VERSION}" in "bookworm"|"bullseye") ;; - *) cd_error_os "CD_OS_VERSION" ;; + *) cd_error_os "CIDD_OS_VERSION" ;; esac ;; - "${CD_OS_FEDORA}") - case "${CD_OS_VERSION}" in + "${CIDD_OS_FEDORA}") + case "${CIDD_OS_VERSION}" in "39"|"40") ;; - *) cd_error_os "CD_OS_VERSION" ;; + *) cd_error_os "CIDD_OS_VERSION" ;; esac ;; - "${CD_OS_UBUNTU}") - case "${CD_OS_VERSION}" in + "${CIDD_OS_UBUNTU}") + case "${CIDD_OS_VERSION}" in "jammy"|"noble") ;; - *) cd_error_os "CD_OS_VERSION" ;; + *) cd_error_os "CIDD_OS_VERSION" ;; esac ;; *) esac cd_split - cd_echo "CD_OS_ID" "CD_OS_VERSION" + cd_echo "CIDD_OS_ID" "CIDD_OS_VERSION" # universal - CD_DNS_FILE="/etc/resolv.conf" - CD_PKG_CA="ca-certificates" - CD_PKG_GIT="git" + CIDD_DNS_FILE="/etc/resolv.conf" + CIDD_PKG_CA="ca-certificates" + CIDD_PKG_GIT="git" # TODO move to Python - CD_PKG_RSYNC="rsync" - CD_PYTHON_ALIAS="python3" + CIDD_PKG_RSYNC="rsync" + CIDD_PYTHON_ALIAS="python3" cd_split - cd_echo "CD_DNS_FILE" "CD_PKG_CA" "CD_PKG_GIT" "CD_PYTHON_ALIAS" + cd_echo "CIDD_DNS_FILE" "CIDD_PKG_CA" "CIDD_PKG_GIT" "CIDD_PYTHON_ALIAS" # set ca command & root - case "${CD_OS_ID}" in - "${CD_OS_ALMA}"|"${CD_OS_FEDORA}"|"${CD_OS_ROCKY}") - CD_CA_ROOT="/etc/pki/ca-trust/source/anchors" - CD_CMD_CA="update-ca-trust" + case "${CIDD_OS_ID}" in + "${CIDD_OS_ALMA}"|"${CIDD_OS_FEDORA}"|"${CIDD_OS_ROCKY}") + CIDD_CA_ROOT="/etc/pki/ca-trust/source/anchors" + CIDD_CMD_CA="update-ca-trust" ;; - "${CD_OS_ALPINE}") - CD_CA_ROOT="/usr/local/share/ca-certificates" - CD_CMD_CA="update-ca-certificates" + "${CIDD_OS_ALPINE}") + CIDD_CA_ROOT="/usr/local/share/ca-certificates" + CIDD_CMD_CA="update-ca-certificates" ;; - "${CD_OS_ARCH}") - CD_CA_ROOT="/etc/ca-certificates/trust-source/anchors" - CD_CMD_CA="update-ca-trust" + "${CIDD_OS_ARCH}") + CIDD_CA_ROOT="/etc/ca-certificates/trust-source/anchors" + CIDD_CMD_CA="update-ca-trust" ;; - "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") - CD_CA_ROOT="/usr/local/share/ca-certificates" - CD_CMD_CA="update-ca-certificates" + "${CIDD_OS_DEBIAN}"|"${CIDD_OS_UBUNTU}") + CIDD_CA_ROOT="/usr/local/share/ca-certificates" + CIDD_CMD_CA="update-ca-certificates" ;; *) esac cd_split - cd_echo "CD_CA_ROOT" "CD_CMD_CA" + cd_echo "CIDD_CA_ROOT" "CIDD_CMD_CA" # set package manager - case "${CD_OS_ID}" in - "${CD_OS_ALPINE}") - CD_PM="${CD_PM_APK}" + case "${CIDD_OS_ID}" in + "${CIDD_OS_ALPINE}") + CIDD_PM="${CIDD_PM_APK}" ;; - "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") - CD_PM="${CD_PM_APT}" + "${CIDD_OS_DEBIAN}"|"${CIDD_OS_UBUNTU}") + CIDD_PM="${CIDD_PM_APT}" ;; - "${CD_OS_ALMA}"|"${CD_OS_FEDORA}"|"${CD_OS_ROCKY}") - CD_PM="${CD_PM_DNF}" + "${CIDD_OS_ALMA}"|"${CIDD_OS_FEDORA}"|"${CIDD_OS_ROCKY}") + CIDD_PM="${CIDD_PM_DNF}" ;; - "${CD_OS_ARCH}") - CD_PM="${CD_PM_PACMAN}" + "${CIDD_OS_ARCH}") + CIDD_PM="${CIDD_PM_PACMAN}" ;; *) esac cd_split - cd_echo "CD_PM" - case "${CD_PM}" in - "${CD_PM_DNF}") - CD_PM_CLEAN="dnf clean all" - CD_PM_INSTALL="dnf install --assumeyes" - CD_PM_QUERY="rpm --query" - CD_PM_UPDATE="dnf makecache" - CD_PM_UPGRADE="dnf upgrade --assumeyes" - CD_PKG_PKG="" - CD_PM_CONF_PATH="/etc/dnf/dnf.conf" - CD_PM_CONF_TEXT="\ + cd_echo "CIDD_PM" + case "${CIDD_PM}" in + "${CIDD_PM_DNF}") + CIDD_PM_CLEAN="dnf clean all" + CIDD_PM_INSTALL="dnf install --assumeyes" + CIDD_PM_QUERY="rpm --query" + CIDD_PM_UPDATE="dnf makecache" + CIDD_PM_UPGRADE="dnf upgrade --assumeyes" + CIDD_PKG_PKG="" + CIDD_PM_CONF_PATH="/etc/dnf/dnf.conf" + CIDD_PM_CONF_TEXT="\ [main] best=True clean_requirements_on_remove=True @@ -178,209 +178,209 @@ gpgcheck=1 installonly_limit=3 skip_if_unavailable=False " - CD_PM_HTTPS_PATH="/etc/dnf/dnf.conf.d/https.conf" - CD_PM_HTTPS_TEXT="\ + CIDD_PM_HTTPS_PATH="/etc/dnf/dnf.conf.d/https.conf" + CIDD_PM_HTTPS_TEXT="\ sslverify=False " ;; - "${CD_PM_APK}") - CD_PM_CLEAN="apk cache purge" - CD_PM_INSTALL="apk add" - CD_PM_QUERY="apk info" - CD_PM_UPDATE="apk update" - CD_PM_UPGRADE="apk upgrade" - CD_PKG_PKG="" - CD_PM_CONF_PATH="" - CD_PM_CONF_TEXT="" - CD_PM_HTTPS_PATH="/etc/apk/repositories.d/https" - CD_PM_HTTPS_TEXT="\ + "${CIDD_PM_APK}") + CIDD_PM_CLEAN="apk cache purge" + CIDD_PM_INSTALL="apk add" + CIDD_PM_QUERY="apk info" + CIDD_PM_UPDATE="apk update" + CIDD_PM_UPGRADE="apk upgrade" + CIDD_PKG_PKG="" + CIDD_PM_CONF_PATH="" + CIDD_PM_CONF_TEXT="" + CIDD_PM_HTTPS_PATH="/etc/apk/repositories.d/https" + CIDD_PM_HTTPS_TEXT="\ --no-verify " ;; - "${CD_PM_PACMAN}") - CD_PM_CLEAN="pacman --sync --clean --noconfirm" - CD_PM_INSTALL="pacman --sync --noconfirm" - CD_PM_QUERY="pacman --query" - CD_PM_UPDATE="pacman --sync --refresh" - CD_PM_UPGRADE="pacman --sync --sysupgrade --noconfirm" - CD_PKG_PKG="" - CD_PM_CONF_PATH="" - CD_PM_CONF_TEXT="" - CD_PM_HTTPS_PATH="/etc/pacman.d/https.conf" - CD_PM_HTTPS_TEXT="\ + "${CIDD_PM_PACMAN}") + CIDD_PM_CLEAN="pacman --sync --clean --noconfirm" + CIDD_PM_INSTALL="pacman --sync --noconfirm" + CIDD_PM_QUERY="pacman --query" + CIDD_PM_UPDATE="pacman --sync --refresh" + CIDD_PM_UPGRADE="pacman --sync --sysupgrade --noconfirm" + CIDD_PKG_PKG="" + CIDD_PM_CONF_PATH="" + CIDD_PM_CONF_TEXT="" + CIDD_PM_HTTPS_PATH="/etc/pacman.d/https.conf" + CIDD_PM_HTTPS_TEXT="\ SSLVerify = No " ;; - "${CD_PM_APT}") - CD_PM_CLEAN="apt-get clean" - CD_PM_INSTALL="apt-get install --assume-yes" - CD_PM_QUERY="dpkg-query --show" - CD_PM_UPDATE="apt-get update" - CD_PM_UPGRADE="apt-get upgrade --assume-yes" - CD_PKG_PKG="apt-utils" - CD_PM_CONF_PATH="/etc/apt/apt.conf.d/apt.conf" - CD_PM_CONF_TEXT="\ + "${CIDD_PM_APT}") + CIDD_PM_CLEAN="apt-get clean" + CIDD_PM_INSTALL="apt-get install --assume-yes" + CIDD_PM_QUERY="dpkg-query --show" + CIDD_PM_UPDATE="apt-get update" + CIDD_PM_UPGRADE="apt-get upgrade --assume-yes" + CIDD_PKG_PKG="apt-utils" + CIDD_PM_CONF_PATH="/etc/apt/apt.conf.d/apt.conf" + CIDD_PM_CONF_TEXT="\ Acquire::Check-Valid-Until True; APT::Get::Show-Versions True; APT::Install-Recommends False; APT::Install-Suggests False; Dir::Etc::SourceParts \"\"; " - CD_PM_HTTPS_PATH="/etc/apt/apt.conf.d/https" - CD_PM_HTTPS_TEXT="\ + CIDD_PM_HTTPS_PATH="/etc/apt/apt.conf.d/https" + CIDD_PM_HTTPS_TEXT="\ Acquire::https::Verify-Peer False; " ;; *) esac cd_split - cd_echo "CD_PM_CLEAN" \ - "CD_PM_INSTALL" "CD_PM_QUERY" "CD_PM_UPDATE" "CD_PM_UPGRADE" + cd_echo "CIDD_PM_CLEAN" \ + "CIDD_PM_INSTALL" "CIDD_PM_QUERY" "CIDD_PM_UPDATE" "CIDD_PM_UPGRADE" cd_split - cd_echo "CD_PKG_PKG" "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH" + cd_echo "CIDD_PKG_PKG" "CIDD_PM_CONF_PATH" "CIDD_PM_HTTPS_PATH" # specific - case "${CD_OS_ID}" in - "${CD_OS_ALMA}") - CD_URL_DEFAULT="https://repo.almalinux.org/almalinux" + case "${CIDD_OS_ID}" in + "${CIDD_OS_ALMA}") + CIDD_URL_DEFAULT="https://repo.almalinux.org/almalinux" ;; - "${CD_OS_ALPINE}") - CD_URL_DEFAULT="https://dl-cdn.alpinelinux.org/alpine" + "${CIDD_OS_ALPINE}") + CIDD_URL_DEFAULT="https://dl-cdn.alpinelinux.org/alpine" ;; - "${CD_OS_ARCH}") - CD_URL_DEFAULT="https://geo.mirror.pkgbuild.com" + "${CIDD_OS_ARCH}") + CIDD_URL_DEFAULT="https://geo.mirror.pkgbuild.com" ;; - "${CD_OS_DEBIAN}") - CD_URL_DEFAULT="http://deb.debian.org/debian" + "${CIDD_OS_DEBIAN}") + CIDD_URL_DEFAULT="http://deb.debian.org/debian" ;; - "${CD_OS_FEDORA}") - CD_URL_DEFAULT="http://download.example/pub/fedora/linux/releases" + "${CIDD_OS_FEDORA}") + CIDD_URL_DEFAULT="http://download.example/pub/fedora/linux/releases" ;; - "${CD_OS_ROCKY}") - CD_URL_DEFAULT="http://dl.rockylinux.org/\$contentdir" + "${CIDD_OS_ROCKY}") + CIDD_URL_DEFAULT="http://dl.rockylinux.org/\$contentdir" ;; - "${CD_OS_UBUNTU}") - CD_URL_DEFAULT="http://archive.ubuntu.com/ubuntu" + "${CIDD_OS_UBUNTU}") + CIDD_URL_DEFAULT="http://archive.ubuntu.com/ubuntu" ;; *) esac - CD_URL_CHOSEN="${CD_URL_DEFAULT}" - case "${CD_OS_ID}" in - "${CD_OS_ALMA}") - [ -n "${CD_URL_ALMA}" ] && CD_URL_CHOSEN="${CD_URL_ALMA}" + CIDD_URL_CHOSEN="${CIDD_URL_DEFAULT}" + case "${CIDD_OS_ID}" in + "${CIDD_OS_ALMA}") + [ -n "${CIDD_URL_ALMA}" ] && CIDD_URL_CHOSEN="${CIDD_URL_ALMA}" ;; - "${CD_OS_ALPINE}") - [ -n "${CD_URL_ALPINE}" ] && CD_URL_CHOSEN="${CD_URL_ALPINE}" + "${CIDD_OS_ALPINE}") + [ -n "${CIDD_URL_ALPINE}" ] && CIDD_URL_CHOSEN="${CIDD_URL_ALPINE}" ;; - "${CD_OS_ARCH}") - [ -n "${CD_URL_ARCH}" ] && CD_URL_CHOSEN="${CD_URL_ARCH}" + "${CIDD_OS_ARCH}") + [ -n "${CIDD_URL_ARCH}" ] && CIDD_URL_CHOSEN="${CIDD_URL_ARCH}" ;; - "${CD_OS_DEBIAN}") - [ -n "${CD_URL_DEBIAN}" ] && CD_URL_CHOSEN="${CD_URL_DEBIAN}" \ - || CD_URL_CHOSEN="https://deb.debian.org/debian" + "${CIDD_OS_DEBIAN}") + [ -n "${CIDD_URL_DEBIAN}" ] && CIDD_URL_CHOSEN="${CIDD_URL_DEBIAN}" \ + || CIDD_URL_CHOSEN="https://deb.debian.org/debian" ;; - "${CD_OS_FEDORA}") - [ -n "${CD_URL_FEDORA}" ] && CD_URL_CHOSEN="${CD_URL_FEDORA}" \ - || CD_URL_CHOSEN="https://rpmfind.net/linux/fedora/linux/releases" + "${CIDD_OS_FEDORA}") + [ -n "${CIDD_URL_FEDORA}" ] && CIDD_URL_CHOSEN="${CIDD_URL_FEDORA}" \ + || CIDD_URL_CHOSEN="https://rpmfind.net/linux/fedora/linux/releases" ;; - "${CD_OS_ROCKY}") - [ -n "${CD_URL_ROCKY}" ] && CD_URL_CHOSEN="${CD_URL_ROCKY}" \ - || CD_URL_CHOSEN="https://dl.rockylinux.org/\$contentdir" + "${CIDD_OS_ROCKY}") + [ -n "${CIDD_URL_ROCKY}" ] && CIDD_URL_CHOSEN="${CIDD_URL_ROCKY}" \ + || CIDD_URL_CHOSEN="https://dl.rockylinux.org/\$contentdir" ;; - "${CD_OS_UBUNTU}") - [ -n "${CD_URL_UBUNTU}" ] && CD_URL_CHOSEN="${CD_URL_UBUNTU}" \ - || CD_URL_CHOSEN="https://ubuntu.mirrors.ovh.net/ubuntu" + "${CIDD_OS_UBUNTU}") + [ -n "${CIDD_URL_UBUNTU}" ] && CIDD_URL_CHOSEN="${CIDD_URL_UBUNTU}" \ + || CIDD_URL_CHOSEN="https://ubuntu.mirrors.ovh.net/ubuntu" ;; *) esac cd_split - cd_echo "CD_URL_DEFAULT" "CD_URL_CHOSEN" + cd_echo "CIDD_URL_DEFAULT" "CIDD_URL_CHOSEN" # set python command & package - case "${CD_OS_ID}" in - "${CD_OS_ALMA}"|"${CD_OS_ROCKY}") - CD_PYTHON_COMMAND="python3.11" - CD_PYTHON_PACKAGE="python3.11" + case "${CIDD_OS_ID}" in + "${CIDD_OS_ALMA}"|"${CIDD_OS_ROCKY}") + CIDD_PYTHON_COMMAND="python3.11" + CIDD_PYTHON_PACKAGE="python3.11" ;; - "${CD_OS_ALPINE}") - CD_PYTHON_COMMAND="python3.11" - CD_PYTHON_PACKAGE="python3" + "${CIDD_OS_ALPINE}") + CIDD_PYTHON_COMMAND="python3.11" + CIDD_PYTHON_PACKAGE="python3" ;; - "${CD_OS_ARCH}") - CD_PYTHON_COMMAND="python3.12" - CD_PYTHON_PACKAGE="python" + "${CIDD_OS_ARCH}") + CIDD_PYTHON_COMMAND="python3.12" + CIDD_PYTHON_PACKAGE="python" ;; - "${CD_OS_DEBIAN}") - case "${CD_OS_VERSION}" in - "bookworm") CD_PYTHON_COMMAND="python3.11" ;; - "bullseye") CD_PYTHON_COMMAND="python3.9" ;; + "${CIDD_OS_DEBIAN}") + case "${CIDD_OS_VERSION}" in + "bookworm") CIDD_PYTHON_COMMAND="python3.11" ;; + "bullseye") CIDD_PYTHON_COMMAND="python3.9" ;; *) esac - CD_PYTHON_PACKAGE="python3" + CIDD_PYTHON_PACKAGE="python3" ;; - "${CD_OS_FEDORA}") - CD_PYTHON_COMMAND="python3.12" - CD_PYTHON_PACKAGE="python3" + "${CIDD_OS_FEDORA}") + CIDD_PYTHON_COMMAND="python3.12" + CIDD_PYTHON_PACKAGE="python3" ;; - "${CD_OS_UBUNTU}") - case "${CD_OS_VERSION}" in - "noble") CD_PYTHON_COMMAND="python3.12" ;; - "jammy") CD_PYTHON_COMMAND="python3.10" ;; + "${CIDD_OS_UBUNTU}") + case "${CIDD_OS_VERSION}" in + "noble") CIDD_PYTHON_COMMAND="python3.12" ;; + "jammy") CIDD_PYTHON_COMMAND="python3.10" ;; *) esac - CD_PYTHON_PACKAGE="python3" + CIDD_PYTHON_PACKAGE="python3" ;; *) esac # set python packages - case "${CD_OS_ID}" in - "${CD_OS_ALMA}"|"${CD_OS_FEDORA}"|"${CD_OS_ROCKY}") - CD_PYTHON_PACKAGES="/usr/lib64/${CD_PYTHON_COMMAND}/site-packages" + case "${CIDD_OS_ID}" in + "${CIDD_OS_ALMA}"|"${CIDD_OS_FEDORA}"|"${CIDD_OS_ROCKY}") + CIDD_PYTHON_PACKAGES="/usr/lib64/${CIDD_PYTHON_COMMAND}/site-packages" ;; - "${CD_OS_ALPINE}"|"${CD_OS_ARCH}") - CD_PYTHON_PACKAGES="/usr/lib/${CD_PYTHON_COMMAND}/site-packages" + "${CIDD_OS_ALPINE}"|"${CIDD_OS_ARCH}") + CIDD_PYTHON_PACKAGES="/usr/lib/${CIDD_PYTHON_COMMAND}/site-packages" ;; - "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") - CD_PYTHON_PACKAGES="/usr/lib/${CD_PYTHON_ALIAS}/dist-packages" + "${CIDD_OS_DEBIAN}"|"${CIDD_OS_UBUNTU}") + CIDD_PYTHON_PACKAGES="/usr/lib/${CIDD_PYTHON_ALIAS}/dist-packages" ;; *) esac cd_split - cd_echo "CD_PYTHON_COMMAND" "CD_PYTHON_PACKAGE" "CD_PYTHON_PACKAGES" + cd_echo "CIDD_PYTHON_COMMAND" "CIDD_PYTHON_PACKAGE" "CIDD_PYTHON_PACKAGES" # variables - [ -n "${CD_CA_1}" ] && CD_CA=true + [ -n "${CIDD_CA_1}" ] && CIDD_CA=true # continuous integration platform if [ -n "${GITHUB_ACTIONS}" ] ; then # github → gitea → forgejo if [ -n "${GITHUB_SERVER_URL}" ] ; then - CD_SERVER_URL="${GITHUB_SERVER_URL}" + CIDD_SERVER_URL="${GITHUB_SERVER_URL}" else cd_error_ci "GITHUB_SERVER_URL" fi if [ -n "${GITHUB_REPOSITORY}" ] ; then - CD_PROJECTS_GROUP="$(dirname "${GITHUB_REPOSITORY}")" - CD_PROJECT_NAME="$(basename "${GITHUB_REPOSITORY}")" + CIDD_PROJECTS_GROUP="$(dirname "${GITHUB_REPOSITORY}")" + CIDD_PROJECT_NAME="$(basename "${GITHUB_REPOSITORY}")" else cd_error_ci "GITHUB_REPOSITORY" fi if [ -n "${GITHUB_REF_NAME}" ] ; then - CD_PROJECT_BRANCH="${GITHUB_REF_NAME}" + CIDD_PROJECT_BRANCH="${GITHUB_REF_NAME}" else cd_error_ci "GITHUB_REF_NAME" fi elif [ -n "${GITLAB_CI}" ] ; then # gitlab if [ -n "${CI_SERVER_URL}" ] ; then - CD_SERVER_URL="${CI_SERVER_URL}" + CIDD_SERVER_URL="${CI_SERVER_URL}" else cd_error_ci "CI_SERVER_URL" fi if [ -n "${CI_PROJECT_PATH}" ] ; then - CD_PROJECTS_GROUP="$(dirname "${CI_PROJECT_PATH}")" - CD_PROJECT_NAME="$(basename "${CI_PROJECT_PATH}")" + CIDD_PROJECTS_GROUP="$(dirname "${CI_PROJECT_PATH}")" + CIDD_PROJECT_NAME="$(basename "${CI_PROJECT_PATH}")" else cd_error_ci "CI_PROJECT_PATH" fi if [ -n "${CI_COMMIT_BRANCH}" ] ; then - CD_PROJECT_BRANCH="${CI_COMMIT_BRANCH}" + CIDD_PROJECT_BRANCH="${CI_COMMIT_BRANCH}" else cd_error_ci "CI_COMMIT_BRANCH" fi @@ -388,34 +388,34 @@ Acquire::https::Verify-Peer False; # unsupported cd_error_ci "ø" fi - [ -n "${CD_SERVER_URL}" ] || cd_error_ci "CD_SERVER_URL" - [ -n "${CD_PROJECTS_GROUP}" ] || cd_error_ci "CD_PROJECTS_GROUP" - [ -n "${CD_PROJECT_NAME}" ] || cd_error_ci "CD_PROJECT_NAME" - [ -n "${CD_PROJECT_BRANCH}" ] || cd_error_ci "CD_PROJECT_BRANCH" + [ -n "${CIDD_SERVER_URL}" ] || cd_error_ci "CIDD_SERVER_URL" + [ -n "${CIDD_PROJECTS_GROUP}" ] || cd_error_ci "CIDD_PROJECTS_GROUP" + [ -n "${CIDD_PROJECT_NAME}" ] || cd_error_ci "CIDD_PROJECT_NAME" + [ -n "${CIDD_PROJECT_BRANCH}" ] || cd_error_ci "CIDD_PROJECT_BRANCH" # - CD_PROJECTS_URL="${CD_SERVER_URL}/${CD_PROJECTS_GROUP}" + CIDD_PROJECTS_URL="${CIDD_SERVER_URL}/${CIDD_PROJECTS_GROUP}" # cd_split - cd_echo "CD_CA" + cd_echo "CIDD_CA" cd_split - cd_echo "CD_SERVER_URL" \ - "CD_PROJECTS_GROUP" "CD_PROJECT_NAME" "CD_PROJECT_BRANCH" + cd_echo "CIDD_SERVER_URL" \ + "CIDD_PROJECTS_GROUP" "CIDD_PROJECT_NAME" "CIDD_PROJECT_BRANCH" cd_split - cd_echo "CD_PROJECTS_URL" + cd_echo "CIDD_PROJECTS_URL" # TODO move to Python - case "${CD_PM}" in - "${CD_PM_APK}"|"${CD_PM_APT}") CD_PKG_SSH="openssh-client" ;; - "${CD_PM_DNF}") CD_PKG_SSH="openssh-clients" ;; - "${CD_PM_PACMAN}") CD_PKG_SSH="openssh" ;; + case "${CIDD_PM}" in + "${CIDD_PM_APK}"|"${CIDD_PM_APT}") CIDD_PKG_SSH="openssh-client" ;; + "${CIDD_PM_DNF}") CIDD_PKG_SSH="openssh-clients" ;; + "${CIDD_PM_PACMAN}") CIDD_PKG_SSH="openssh" ;; *) esac } cd_set_packages_repositories () { cd_step "Set packages repositories" - case "${CD_OS_ID}" in - "${CD_OS_ALMA}") - case "${CD_OS_VERSION}" in + case "${CIDD_OS_ID}" in + "${CIDD_OS_ALMA}") + case "${CIDD_OS_VERSION}" in "8") \ cd_set_packages_repositories__file="/etc/yum.repos.d/almalinux.repo" ;; "9") \ @@ -424,27 +424,27 @@ cd_set_packages_repositories__file="/etc/yum.repos.d/almalinux-baseos.repo" ;; esac cd_sed "${cd_set_packages_repositories__file}" \ "|^mirrorlist|# mirrorlist|" \ - "|${CD_URL_DEFAULT}|${CD_URL_CHOSEN}|" \ + "|${CIDD_URL_DEFAULT}|${CIDD_URL_CHOSEN}|" \ "|^# baseurl|baseurl|" ;; - "${CD_OS_ALPINE}") + "${CIDD_OS_ALPINE}") cd_set_packages_repositories__file="/etc/apk/repositories" cd_write "${cd_set_packages_repositories__file}" "\ -${CD_URL_CHOSEN}/v${CD_OS_VERSION}/main -${CD_URL_CHOSEN}/v${CD_OS_VERSION}/community +${CIDD_URL_CHOSEN}/v${CIDD_OS_VERSION}/main +${CIDD_URL_CHOSEN}/v${CIDD_OS_VERSION}/community " ;; - "${CD_OS_DEBIAN}") + "${CIDD_OS_DEBIAN}") cd_set_packages_repositories__file="/etc/apt/sources.list" cd_write "${cd_set_packages_repositories__file}" "\ -deb ${CD_URL_CHOSEN} ${CD_OS_VERSION} main -deb ${CD_URL_CHOSEN} ${CD_OS_VERSION}-backports main -deb ${CD_URL_CHOSEN} ${CD_OS_VERSION}-updates main -deb ${CD_URL_CHOSEN}-security ${CD_OS_VERSION}-security main +deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION} main +deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION}-backports main +deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION}-updates main +deb ${CIDD_URL_CHOSEN}-security ${CIDD_OS_VERSION}-security main " ;; - "${CD_OS_ROCKY}") - case "${CD_OS_VERSION}" in + "${CIDD_OS_ROCKY}") + case "${CIDD_OS_VERSION}" in "8") \ cd_set_packages_repositories__file="/etc/yum.repos.d/Rocky-BaseOS.repo" ;; "9") \ @@ -453,16 +453,16 @@ cd_set_packages_repositories__file="/etc/yum.repos.d/rocky.repo" ;; esac cd_sed "${cd_set_packages_repositories__file}" \ "|^mirrorlist|# mirrorlist|" \ - "|${CD_URL_DEFAULT}|${CD_URL_CHOSEN}|" \ + "|${CIDD_URL_DEFAULT}|${CIDD_URL_CHOSEN}|" \ "|^#baseurl|baseurl|" ;; - "${CD_OS_UBUNTU}") + "${CIDD_OS_UBUNTU}") cd_set_packages_repositories__file="/etc/apt/sources.list" cd_write "${cd_set_packages_repositories__file}" "\ -deb ${CD_URL_CHOSEN} ${CD_OS_VERSION} main -deb ${CD_URL_CHOSEN} ${CD_OS_VERSION}-backports main -deb ${CD_URL_CHOSEN} ${CD_OS_VERSION}-updates main -deb ${CD_URL_CHOSEN} ${CD_OS_VERSION}-security main +deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION} main +deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION}-backports main +deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION}-updates main +deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION}-security main " ;; *) @@ -471,9 +471,9 @@ deb ${CD_URL_CHOSEN} ${CD_OS_VERSION}-security main cd_set_packages_configuration () { cd_step "Set packages configuration" - cd_write "${CD_PM_CONF_PATH}" "${CD_PM_CONF_TEXT}" - case "${CD_OS_ID}" in - "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") + cd_write "${CIDD_PM_CONF_PATH}" "${CIDD_PM_CONF_TEXT}" + case "${CIDD_OS_ID}" in + "${CIDD_OS_DEBIAN}"|"${CIDD_OS_UBUNTU}") export DEBIAN_FRONTEND="noninteractive" ;; *) @@ -489,47 +489,47 @@ cd_list_working_directory () { } cd_set_https_verification_off () { - if [ -n "${CD_CA}" ] || [ "${CD_PM}" = "${CD_PM_APT}" ] ; then + if [ -n "${CIDD_CA}" ] || [ "${CIDD_PM}" = "${CIDD_PM_APT}" ] ; then cd_step "Set HTTPS verification off" - cd_mkdir "$(dirname "${CD_PM_HTTPS_PATH}")" - cd_write "${CD_PM_HTTPS_PATH}" "${CD_PM_HTTPS_TEXT}" + cd_mkdir "$(dirname "${CIDD_PM_HTTPS_PATH}")" + cd_write "${CIDD_PM_HTTPS_PATH}" "${CIDD_PM_HTTPS_TEXT}" fi } cd_set_dns_resolving () { cd_step "Set DNS resolving" - for cd_set_dns_resolving__server in ${CD_DNS} ; do + for cd_set_dns_resolving__server in ${CIDD_DNS} ; do cd_set_dns_resolving__text="${cd_set_dns_resolving__text}\ nameserver ${cd_set_dns_resolving__server} " done - cd_write "${CD_DNS_FILE}" "${cd_set_dns_resolving__text}" + cd_write "${CIDD_DNS_FILE}" "${cd_set_dns_resolving__text}" } cd_update_packages_catalog () { cd_step "Update packages catalog" - ${CD_PM_UPDATE} || exit + ${CIDD_PM_UPDATE} || exit } cd_install_packages_tools () { cd_step "Install packages tools" - cd_install_package "${CD_PKG_PKG}" + cd_install_package "${CIDD_PKG_PKG}" } cd_install_ca_certificates () { cd_step "Install CA" - cd_install_package "${CD_PKG_CA}" + cd_install_package "${CIDD_PKG_CA}" } cd_write_ca_certificates () { cd_step "Write CA certificates" - cd_mkdir "${CD_CA_ROOT}" + cd_mkdir "${CIDD_CA_ROOT}" cd_write_ca_certificates__index=1 eval "cd_write_ca_certificates__text=\ -\"\${CD_CA_${cd_write_ca_certificates__index}}\"" +\"\${CIDD_CA_${cd_write_ca_certificates__index}}\"" while [ -n "${cd_write_ca_certificates__text}" ] ; do cd_write_ca_certificates__path="\ -${CD_CA_ROOT}/${cd_write_ca_certificates__index}.crt" +${CIDD_CA_ROOT}/${cd_write_ca_certificates__index}.crt" cd_split cd_write \ "${cd_write_ca_certificates__path}" \ @@ -537,52 +537,52 @@ ${CD_CA_ROOT}/${cd_write_ca_certificates__index}.crt" cd_openssl "${cd_write_ca_certificates__path}" cd_write_ca_certificates__index=$((cd_write_ca_certificates__index+1)) eval "cd_write_ca_certificates__text=\ -\"\${CD_CA_${cd_write_ca_certificates__index}}\"" +\"\${CIDD_CA_${cd_write_ca_certificates__index}}\"" done } cd_update_ca_certificates () { cd_step "Update CA certificates" - ${CD_CMD_CA} || exit + ${CIDD_CMD_CA} || exit } cd_set_https_verification_on () { cd_step "Set HTTPS verification on" - cd_rm "${CD_PM_HTTPS_PATH}" + cd_rm "${CIDD_PM_HTTPS_PATH}" } cd_upgrade_packages () { cd_step "Upgrade packages" - ${CD_PM_UPGRADE} || exit + ${CIDD_PM_UPGRADE} || exit } cd_install_git () { cd_step "Install Git" - cd_install_package "${CD_PKG_GIT}" + cd_install_package "${CIDD_PKG_GIT}" } cd_install_python () { cd_step "Install Python" - cd_install_package "${CD_PYTHON_PACKAGE}" + cd_install_package "${CIDD_PYTHON_PACKAGE}" cd_split - cd_ln_python "${CD_PYTHON_COMMAND}" + cd_ln_python "${CIDD_PYTHON_COMMAND}" } # TODO move to Python cd_install_rsync () { cd_step "Install Rsync" - cd_install_package "${CD_PKG_RSYNC}" + cd_install_package "${CIDD_PKG_RSYNC}" } # TODO move to Python cd_install_ssh () { cd_step "Install SSH" - cd_install_package "${CD_PKG_SSH}" + cd_install_package "${CIDD_PKG_SSH}" } cd_clean_packages_cache () { cd_step "Clean packages cache" - ${CD_PM_CLEAN} || exit + ${CIDD_PM_CLEAN} || exit } cd_install_python_modules () { @@ -590,10 +590,10 @@ cd_install_python_modules () { cd_install_python_modules__root="$(mktemp --directory)" || exit echo "→ ${cd_install_python_modules__root}" for cd_install_python_modules__repository \ - in "${CD_GIT_CHILD}" "${CD_GIT_PARENT}" ; do + in "${CIDD_GIT_CHILD}" "${CIDD_GIT_PARENT}" ; do cd_split cd_install_python_modules__url="\ -${CD_PROJECTS_URL}/${cd_install_python_modules__repository}" +${CIDD_PROJECTS_URL}/${cd_install_python_modules__repository}" echo "\ ${cd_install_python_modules__url} ↓" @@ -609,13 +609,13 @@ ${cd_install_python_modules__root}\ echo "\ ${cd_install_python_modules__path} ↓ -${CD_PYTHON_PACKAGES}" +${CIDD_PYTHON_PACKAGES}" cp --recursive \ - "${cd_install_python_modules__path}" "${CD_PYTHON_PACKAGES}" \ + "${cd_install_python_modules__path}" "${CIDD_PYTHON_PACKAGES}" \ || exit done cd_split - cd_ls "${CD_PYTHON_PACKAGES}" + cd_ls "${CIDD_PYTHON_PACKAGES}" cd_split cd_rm "${cd_install_python_modules__root}" } @@ -625,23 +625,23 @@ cd_write_python_module () { for cd_write_python_module__variable \ in OPEN DOWN VERT SPLT __UP SHUT OS_ID OS_VERSION ; do cd_write_python_module__value="\ -$(cd_echo "CD_${cd_write_python_module__variable}")" +$(cd_echo "CIDD_${cd_write_python_module__variable}")" cd_write_python_module__text="${cd_write_python_module__text}\ ${cd_write_python_module__value} " done - cd_write "${CD_PYTHON_PACKAGES}/env.py" "${cd_write_python_module__text}\ -CD_STEP = $((CD_STEP+1)) + cd_write "${CIDD_PYTHON_PACKAGES}/env.py" "${cd_write_python_module__text}\ +CIDD_STEP = $((CIDD_STEP+1)) " } cd_switch_to_python () { cd_step "Switch to Python" echo "\ -${CD_PATH} +${CIDD_PATH} ↓ -${CD_PYTHON_PACKAGES}/${CD_GIT_CHILD}" - "${CD_PYTHON_ALIAS}" -m "${CD_GIT_CHILD}" "${@}" +${CIDD_PYTHON_PACKAGES}/${CIDD_GIT_CHILD}" + "${CIDD_PYTHON_ALIAS}" -m "${CIDD_GIT_CHILD}" "${@}" } # functions @@ -666,14 +666,14 @@ cd_echo () { cd_error_ci () { echo "× CI: ${*}" - exit "${CD_ERROR_CI}" + exit "${CIDD_ERROR_CI}" } cd_error_os () { cd_error_os__variable="${1}" printf "× OS: " cd_echo "${cd_error_os__variable}" - exit "${CD_ERROR_OS}" + exit "${CIDD_ERROR_OS}" } cd_grep_os () { @@ -688,15 +688,15 @@ cd_grep_os () { cd_install_package () { cd_install_package__name="${1}" if [ -n "${cd_install_package__name}" ] ; then - ${CD_PM_INSTALL} "${cd_install_package__name}" || exit + ${CIDD_PM_INSTALL} "${cd_install_package__name}" || exit fi } cd_ln_python () { cd_ln_python__command="${1}" if [ -n "${cd_ln_python__command}" ] ; then - echo "→ ${CD_PYTHON_ALIAS} → ${cd_ln_python__command}" - ln -f -s "${cd_ln_python__command}" "/usr/bin/${CD_PYTHON_ALIAS}" \ + echo "→ ${CIDD_PYTHON_ALIAS} → ${cd_ln_python__command}" + ln -f -s "${cd_ln_python__command}" "/usr/bin/${CIDD_PYTHON_ALIAS}" \ || exit fi } @@ -719,7 +719,7 @@ cd_mkdir () { } cd_open () { - echo "${CD_OPEN}${*}" + echo "${CIDD_OPEN}${*}" } cd_openssl () { @@ -754,19 +754,19 @@ cd_sed () { } cd_shut () { - echo "${CD_SHUT}${*}" + echo "${CIDD_SHUT}${*}" } cd_split () { - echo "${CD_SPLT}" + echo "${CIDD_SPLT}" } cd_step () { - CD_STEP=$((CD_STEP+1)) + CIDD_STEP=$((CIDD_STEP+1)) echo "\ -${CD_DOWN} -${CD_VERT} ${CD_STEP} ${*} -${CD___UP}" +${CIDD_DOWN} +${CIDD_VERT} ${CIDD_STEP} ${*} +${CIDD___UP}" } cd_write () { @@ -782,36 +782,36 @@ cd_write () { # constants -CD_BOX_DOWN="╭" -CD_BOX_LEFT="╴" -CD_BOX_RIGHT="╶" -CD_BOX_UP="╰" -CD_BOX_VERTICAL="│" +CIDD_BOX_DOWN="╭" +CIDD_BOX_LEFT="╴" +CIDD_BOX_RIGHT="╶" +CIDD_BOX_UP="╰" +CIDD_BOX_VERTICAL="│" -CD_ERROR_CI=2 -CD_ERROR_OS=1 +CIDD_ERROR_CI=2 +CIDD_ERROR_OS=1 -CD_OS_ALMA="alma" -CD_OS_ALPINE="alpine" -CD_OS_ARCH="arch" -CD_OS_DEBIAN="debian" -CD_OS_FEDORA="fedora" -CD_OS_ROCKY="rocky" -CD_OS_UBUNTU="ubuntu" +CIDD_OS_ALMA="alma" +CIDD_OS_ALPINE="alpine" +CIDD_OS_ARCH="arch" +CIDD_OS_DEBIAN="debian" +CIDD_OS_FEDORA="fedora" +CIDD_OS_ROCKY="rocky" +CIDD_OS_UBUNTU="ubuntu" -CD_PM_APK="apk" -CD_PM_APT="apt" -CD_PM_DNF="dnf" -CD_PM_PACMAN="pacman" +CIDD_PM_APK="apk" +CIDD_PM_APT="apt" +CIDD_PM_DNF="dnf" +CIDD_PM_PACMAN="pacman" -CD_HORIZONTAL="────╌╌╌╌┄┄┄┄┈┈┈┈" +CIDD_HORIZONTAL="────╌╌╌╌┄┄┄┄┈┈┈┈" -CD_OPEN="${CD_BOX_DOWN}${CD_BOX_LEFT}" -CD_DOWN="${CD_BOX_DOWN}${CD_HORIZONTAL}" -CD_VERT="${CD_BOX_VERTICAL}" -CD_SPLT="${CD_BOX_RIGHT}${CD_HORIZONTAL}" -CD___UP="${CD_BOX_UP}${CD_HORIZONTAL}" -CD_SHUT="${CD_BOX_UP}${CD_BOX_LEFT}" +CIDD_OPEN="${CIDD_BOX_DOWN}${CIDD_BOX_LEFT}" +CIDD_DOWN="${CIDD_BOX_DOWN}${CIDD_HORIZONTAL}" +CIDD_VERT="${CIDD_BOX_VERTICAL}" +CIDD_SPLT="${CIDD_BOX_RIGHT}${CIDD_HORIZONTAL}" +CIDD___UP="${CIDD_BOX_UP}${CIDD_HORIZONTAL}" +CIDD_SHUT="${CIDD_BOX_UP}${CIDD_BOX_LEFT}" # run cd_main "${@}" From 128c4ebb5c046812a546d8ec65e37c1fa015fd35 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 21 Jun 2024 13:20:20 +0200 Subject: [PATCH 08/21] .sh/cidd --- cidd.sh | 498 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 249 insertions(+), 249 deletions(-) diff --git a/cidd.sh b/cidd.sh index b5399a9..111b73c 100644 --- a/cidd.sh +++ b/cidd.sh @@ -8,43 +8,43 @@ [ -n "${CIDD_GIT_PARENT}" ] || CIDD_GIT_PARENT="rwx" # main -cd_main () { - cd_set_environment_variables - cd_set_packages_repositories - cd_set_packages_configuration +cidd_main () { + cidd_set_environment_variables + cidd_set_packages_repositories + cidd_set_packages_configuration # - cd_list_working_directory - cd_set_https_verification_off - cd_set_dns_resolving - cd_update_packages_catalog - cd_install_packages_tools - cd_install_ca_certificates - cd_write_ca_certificates - cd_update_ca_certificates - cd_set_https_verification_on - cd_update_packages_catalog - cd_upgrade_packages - cd_install_git - cd_install_python + cidd_list_working_directory + cidd_set_https_verification_off + cidd_set_dns_resolving + cidd_update_packages_catalog + cidd_install_packages_tools + cidd_install_ca_certificates + cidd_write_ca_certificates + cidd_update_ca_certificates + cidd_set_https_verification_on + cidd_update_packages_catalog + cidd_upgrade_packages + cidd_install_git + cidd_install_python # TODO move to Python - cd_install_rsync + cidd_install_rsync # TODO move to Python - cd_install_ssh - cd_clean_packages_cache - cd_install_python_modules - cd_write_python_module - cd_switch_to_python "${@}" + cidd_install_ssh + cidd_clean_packages_cache + cidd_install_python_modules + cidd_write_python_module + cidd_switch_to_python "${@}" } # steps -cd_set_environment_variables () { - cd_step "Set environment variables" +cidd_set_environment_variables () { + cidd_step "Set environment variables" # set path CIDD_PATH="$(realpath "${0}")" - cd_echo "CIDD_PATH" + cidd_echo "CIDD_PATH" # set operating system id - CIDD_OS_ID="$(cd_grep_os ID)" + CIDD_OS_ID="$(cidd_grep_os ID)" case "${CIDD_OS_ID}" in "almalinux") CIDD_OS_ID="${CIDD_OS_ALMA}" ;; "alpine") CIDD_OS_ID="${CIDD_OS_ALPINE}" ;; @@ -53,20 +53,20 @@ cd_set_environment_variables () { "fedora") CIDD_OS_ID="${CIDD_OS_FEDORA}" ;; "rocky") CIDD_OS_ID="${CIDD_OS_ROCKY}" ;; "ubuntu") CIDD_OS_ID="${CIDD_OS_UBUNTU}" ;; - *) cd_error_os "CIDD_OS_ID" ;; + *) cidd_error_os "CIDD_OS_ID" ;; esac # set operating system version case "${CIDD_OS_ID}" in "${CIDD_OS_ALMA}"|"${CIDD_OS_ARCH}"|"${CIDD_OS_FEDORA}"|"${CIDD_OS_ROCKY}") - CIDD_OS_VERSION=$(cd_grep_os VERSION_ID \ + CIDD_OS_VERSION=$(cidd_grep_os VERSION_ID \ | sed "s|^\([0-9]\+\)\..*|\1|") ;; "${CIDD_OS_ALPINE}") - CIDD_OS_VERSION=$(cd_grep_os VERSION_ID \ + CIDD_OS_VERSION=$(cidd_grep_os VERSION_ID \ | sed "s|^\([0-9]\+\.[0-9]\+\)\..*|\1|") ;; "${CIDD_OS_DEBIAN}"|"${CIDD_OS_UBUNTU}") - CIDD_OS_VERSION="$(cd_grep_os VERSION_CODENAME)" + CIDD_OS_VERSION="$(cidd_grep_os VERSION_CODENAME)" ;; *) esac @@ -75,43 +75,43 @@ cd_set_environment_variables () { "${CIDD_OS_ALMA}"|"${CIDD_OS_ROCKY}") case "${CIDD_OS_VERSION}" in "8"|"9") ;; - *) cd_error_os "CIDD_OS_VERSION" ;; + *) cidd_error_os "CIDD_OS_VERSION" ;; esac ;; "${CIDD_OS_ALPINE}") case "${CIDD_OS_VERSION}" in "3.18"|"3.19") ;; - *) cd_error_os "CIDD_OS_VERSION" ;; + *) cidd_error_os "CIDD_OS_VERSION" ;; esac ;; "${CIDD_OS_ARCH}") case "${CIDD_OS_VERSION}" in "20231112"|"20240101") ;; - *) cd_error_os "CIDD_OS_VERSION" ;; + *) cidd_error_os "CIDD_OS_VERSION" ;; esac ;; "${CIDD_OS_DEBIAN}") case "${CIDD_OS_VERSION}" in "bookworm"|"bullseye") ;; - *) cd_error_os "CIDD_OS_VERSION" ;; + *) cidd_error_os "CIDD_OS_VERSION" ;; esac ;; "${CIDD_OS_FEDORA}") case "${CIDD_OS_VERSION}" in "39"|"40") ;; - *) cd_error_os "CIDD_OS_VERSION" ;; + *) cidd_error_os "CIDD_OS_VERSION" ;; esac ;; "${CIDD_OS_UBUNTU}") case "${CIDD_OS_VERSION}" in "jammy"|"noble") ;; - *) cd_error_os "CIDD_OS_VERSION" ;; + *) cidd_error_os "CIDD_OS_VERSION" ;; esac ;; *) esac - cd_split - cd_echo "CIDD_OS_ID" "CIDD_OS_VERSION" + cidd_split + cidd_echo "CIDD_OS_ID" "CIDD_OS_VERSION" # universal CIDD_DNS_FILE="/etc/resolv.conf" CIDD_PKG_CA="ca-certificates" @@ -119,8 +119,8 @@ cd_set_environment_variables () { # TODO move to Python CIDD_PKG_RSYNC="rsync" CIDD_PYTHON_ALIAS="python3" - cd_split - cd_echo "CIDD_DNS_FILE" "CIDD_PKG_CA" "CIDD_PKG_GIT" "CIDD_PYTHON_ALIAS" + cidd_split + cidd_echo "CIDD_DNS_FILE" "CIDD_PKG_CA" "CIDD_PKG_GIT" "CIDD_PYTHON_ALIAS" # set ca command & root case "${CIDD_OS_ID}" in "${CIDD_OS_ALMA}"|"${CIDD_OS_FEDORA}"|"${CIDD_OS_ROCKY}") @@ -141,8 +141,8 @@ cd_set_environment_variables () { ;; *) esac - cd_split - cd_echo "CIDD_CA_ROOT" "CIDD_CMD_CA" + cidd_split + cidd_echo "CIDD_CA_ROOT" "CIDD_CMD_CA" # set package manager case "${CIDD_OS_ID}" in "${CIDD_OS_ALPINE}") @@ -159,8 +159,8 @@ cd_set_environment_variables () { ;; *) esac - cd_split - cd_echo "CIDD_PM" + cidd_split + cidd_echo "CIDD_PM" case "${CIDD_PM}" in "${CIDD_PM_DNF}") CIDD_PM_CLEAN="dnf clean all" @@ -233,11 +233,11 @@ Acquire::https::Verify-Peer False; ;; *) esac - cd_split - cd_echo "CIDD_PM_CLEAN" \ + cidd_split + cidd_echo "CIDD_PM_CLEAN" \ "CIDD_PM_INSTALL" "CIDD_PM_QUERY" "CIDD_PM_UPDATE" "CIDD_PM_UPGRADE" - cd_split - cd_echo "CIDD_PKG_PKG" "CIDD_PM_CONF_PATH" "CIDD_PM_HTTPS_PATH" + cidd_split + cidd_echo "CIDD_PKG_PKG" "CIDD_PM_CONF_PATH" "CIDD_PM_HTTPS_PATH" # specific case "${CIDD_OS_ID}" in "${CIDD_OS_ALMA}") @@ -292,8 +292,8 @@ Acquire::https::Verify-Peer False; ;; *) esac - cd_split - cd_echo "CIDD_URL_DEFAULT" "CIDD_URL_CHOSEN" + cidd_split + cidd_echo "CIDD_URL_DEFAULT" "CIDD_URL_CHOSEN" # set python command & package case "${CIDD_OS_ID}" in "${CIDD_OS_ALMA}"|"${CIDD_OS_ROCKY}") @@ -343,8 +343,8 @@ Acquire::https::Verify-Peer False; ;; *) esac - cd_split - cd_echo "CIDD_PYTHON_COMMAND" "CIDD_PYTHON_PACKAGE" "CIDD_PYTHON_PACKAGES" + cidd_split + cidd_echo "CIDD_PYTHON_COMMAND" "CIDD_PYTHON_PACKAGE" "CIDD_PYTHON_PACKAGES" # variables [ -n "${CIDD_CA_1}" ] && CIDD_CA=true # continuous integration platform @@ -353,55 +353,55 @@ Acquire::https::Verify-Peer False; if [ -n "${GITHUB_SERVER_URL}" ] ; then CIDD_SERVER_URL="${GITHUB_SERVER_URL}" else - cd_error_ci "GITHUB_SERVER_URL" + cidd_error_ci "GITHUB_SERVER_URL" fi if [ -n "${GITHUB_REPOSITORY}" ] ; then CIDD_PROJECTS_GROUP="$(dirname "${GITHUB_REPOSITORY}")" CIDD_PROJECT_NAME="$(basename "${GITHUB_REPOSITORY}")" else - cd_error_ci "GITHUB_REPOSITORY" + cidd_error_ci "GITHUB_REPOSITORY" fi if [ -n "${GITHUB_REF_NAME}" ] ; then CIDD_PROJECT_BRANCH="${GITHUB_REF_NAME}" else - cd_error_ci "GITHUB_REF_NAME" + cidd_error_ci "GITHUB_REF_NAME" fi elif [ -n "${GITLAB_CI}" ] ; then # gitlab if [ -n "${CI_SERVER_URL}" ] ; then CIDD_SERVER_URL="${CI_SERVER_URL}" else - cd_error_ci "CI_SERVER_URL" + cidd_error_ci "CI_SERVER_URL" fi if [ -n "${CI_PROJECT_PATH}" ] ; then CIDD_PROJECTS_GROUP="$(dirname "${CI_PROJECT_PATH}")" CIDD_PROJECT_NAME="$(basename "${CI_PROJECT_PATH}")" else - cd_error_ci "CI_PROJECT_PATH" + cidd_error_ci "CI_PROJECT_PATH" fi if [ -n "${CI_COMMIT_BRANCH}" ] ; then CIDD_PROJECT_BRANCH="${CI_COMMIT_BRANCH}" else - cd_error_ci "CI_COMMIT_BRANCH" + cidd_error_ci "CI_COMMIT_BRANCH" fi else # unsupported - cd_error_ci "ø" + cidd_error_ci "ø" fi - [ -n "${CIDD_SERVER_URL}" ] || cd_error_ci "CIDD_SERVER_URL" - [ -n "${CIDD_PROJECTS_GROUP}" ] || cd_error_ci "CIDD_PROJECTS_GROUP" - [ -n "${CIDD_PROJECT_NAME}" ] || cd_error_ci "CIDD_PROJECT_NAME" - [ -n "${CIDD_PROJECT_BRANCH}" ] || cd_error_ci "CIDD_PROJECT_BRANCH" + [ -n "${CIDD_SERVER_URL}" ] || cidd_error_ci "CIDD_SERVER_URL" + [ -n "${CIDD_PROJECTS_GROUP}" ] || cidd_error_ci "CIDD_PROJECTS_GROUP" + [ -n "${CIDD_PROJECT_NAME}" ] || cidd_error_ci "CIDD_PROJECT_NAME" + [ -n "${CIDD_PROJECT_BRANCH}" ] || cidd_error_ci "CIDD_PROJECT_BRANCH" # CIDD_PROJECTS_URL="${CIDD_SERVER_URL}/${CIDD_PROJECTS_GROUP}" # - cd_split - cd_echo "CIDD_CA" - cd_split - cd_echo "CIDD_SERVER_URL" \ + cidd_split + cidd_echo "CIDD_CA" + cidd_split + cidd_echo "CIDD_SERVER_URL" \ "CIDD_PROJECTS_GROUP" "CIDD_PROJECT_NAME" "CIDD_PROJECT_BRANCH" - cd_split - cd_echo "CIDD_PROJECTS_URL" + cidd_split + cidd_echo "CIDD_PROJECTS_URL" # TODO move to Python case "${CIDD_PM}" in "${CIDD_PM_APK}"|"${CIDD_PM_APT}") CIDD_PKG_SSH="openssh-client" ;; @@ -411,32 +411,32 @@ Acquire::https::Verify-Peer False; esac } -cd_set_packages_repositories () { - cd_step "Set packages repositories" +cidd_set_packages_repositories () { + cidd_step "Set packages repositories" case "${CIDD_OS_ID}" in "${CIDD_OS_ALMA}") case "${CIDD_OS_VERSION}" in "8") \ -cd_set_packages_repositories__file="/etc/yum.repos.d/almalinux.repo" ;; +cidd_set_packages_repositories__file="/etc/yum.repos.d/almalinux.repo" ;; "9") \ -cd_set_packages_repositories__file="/etc/yum.repos.d/almalinux-baseos.repo" ;; +cidd_set_packages_repositories__file="/etc/yum.repos.d/almalinux-baseos.repo" ;; *) esac - cd_sed "${cd_set_packages_repositories__file}" \ + cidd_sed "${cidd_set_packages_repositories__file}" \ "|^mirrorlist|# mirrorlist|" \ "|${CIDD_URL_DEFAULT}|${CIDD_URL_CHOSEN}|" \ "|^# baseurl|baseurl|" ;; "${CIDD_OS_ALPINE}") - cd_set_packages_repositories__file="/etc/apk/repositories" - cd_write "${cd_set_packages_repositories__file}" "\ + cidd_set_packages_repositories__file="/etc/apk/repositories" + cidd_write "${cidd_set_packages_repositories__file}" "\ ${CIDD_URL_CHOSEN}/v${CIDD_OS_VERSION}/main ${CIDD_URL_CHOSEN}/v${CIDD_OS_VERSION}/community " ;; "${CIDD_OS_DEBIAN}") - cd_set_packages_repositories__file="/etc/apt/sources.list" - cd_write "${cd_set_packages_repositories__file}" "\ + cidd_set_packages_repositories__file="/etc/apt/sources.list" + cidd_write "${cidd_set_packages_repositories__file}" "\ deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION} main deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION}-backports main deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION}-updates main @@ -446,19 +446,19 @@ deb ${CIDD_URL_CHOSEN}-security ${CIDD_OS_VERSION}-security main "${CIDD_OS_ROCKY}") case "${CIDD_OS_VERSION}" in "8") \ -cd_set_packages_repositories__file="/etc/yum.repos.d/Rocky-BaseOS.repo" ;; +cidd_set_packages_repositories__file="/etc/yum.repos.d/Rocky-BaseOS.repo" ;; "9") \ -cd_set_packages_repositories__file="/etc/yum.repos.d/rocky.repo" ;; +cidd_set_packages_repositories__file="/etc/yum.repos.d/rocky.repo" ;; *) esac - cd_sed "${cd_set_packages_repositories__file}" \ + cidd_sed "${cidd_set_packages_repositories__file}" \ "|^mirrorlist|# mirrorlist|" \ "|${CIDD_URL_DEFAULT}|${CIDD_URL_CHOSEN}|" \ "|^#baseurl|baseurl|" ;; "${CIDD_OS_UBUNTU}") - cd_set_packages_repositories__file="/etc/apt/sources.list" - cd_write "${cd_set_packages_repositories__file}" "\ + cidd_set_packages_repositories__file="/etc/apt/sources.list" + cidd_write "${cidd_set_packages_repositories__file}" "\ deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION} main deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION}-backports main deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION}-updates main @@ -469,9 +469,9 @@ deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION}-security main esac } -cd_set_packages_configuration () { - cd_step "Set packages configuration" - cd_write "${CIDD_PM_CONF_PATH}" "${CIDD_PM_CONF_TEXT}" +cidd_set_packages_configuration () { + cidd_step "Set packages configuration" + cidd_write "${CIDD_PM_CONF_PATH}" "${CIDD_PM_CONF_TEXT}" case "${CIDD_OS_ID}" in "${CIDD_OS_DEBIAN}"|"${CIDD_OS_UBUNTU}") export DEBIAN_FRONTEND="noninteractive" @@ -482,161 +482,161 @@ cd_set_packages_configuration () { # agnostic steps -cd_list_working_directory () { - cd_step "List working directory" - cd_list_working_directory__path="$(realpath .)" - cd_ls "${cd_list_working_directory__path}" +cidd_list_working_directory () { + cidd_step "List working directory" + cidd_list_working_directory__path="$(realpath .)" + cidd_ls "${cidd_list_working_directory__path}" } -cd_set_https_verification_off () { +cidd_set_https_verification_off () { if [ -n "${CIDD_CA}" ] || [ "${CIDD_PM}" = "${CIDD_PM_APT}" ] ; then - cd_step "Set HTTPS verification off" - cd_mkdir "$(dirname "${CIDD_PM_HTTPS_PATH}")" - cd_write "${CIDD_PM_HTTPS_PATH}" "${CIDD_PM_HTTPS_TEXT}" + cidd_step "Set HTTPS verification off" + cidd_mkdir "$(dirname "${CIDD_PM_HTTPS_PATH}")" + cidd_write "${CIDD_PM_HTTPS_PATH}" "${CIDD_PM_HTTPS_TEXT}" fi } -cd_set_dns_resolving () { - cd_step "Set DNS resolving" - for cd_set_dns_resolving__server in ${CIDD_DNS} ; do - cd_set_dns_resolving__text="${cd_set_dns_resolving__text}\ -nameserver ${cd_set_dns_resolving__server} +cidd_set_dns_resolving () { + cidd_step "Set DNS resolving" + for cidd_set_dns_resolving__server in ${CIDD_DNS} ; do + cidd_set_dns_resolving__text="${cidd_set_dns_resolving__text}\ +nameserver ${cidd_set_dns_resolving__server} " done - cd_write "${CIDD_DNS_FILE}" "${cd_set_dns_resolving__text}" + cidd_write "${CIDD_DNS_FILE}" "${cidd_set_dns_resolving__text}" } -cd_update_packages_catalog () { - cd_step "Update packages catalog" +cidd_update_packages_catalog () { + cidd_step "Update packages catalog" ${CIDD_PM_UPDATE} || exit } -cd_install_packages_tools () { - cd_step "Install packages tools" - cd_install_package "${CIDD_PKG_PKG}" +cidd_install_packages_tools () { + cidd_step "Install packages tools" + cidd_install_package "${CIDD_PKG_PKG}" } -cd_install_ca_certificates () { - cd_step "Install CA" - cd_install_package "${CIDD_PKG_CA}" +cidd_install_ca_certificates () { + cidd_step "Install CA" + cidd_install_package "${CIDD_PKG_CA}" } -cd_write_ca_certificates () { - cd_step "Write CA certificates" - cd_mkdir "${CIDD_CA_ROOT}" - cd_write_ca_certificates__index=1 - eval "cd_write_ca_certificates__text=\ -\"\${CIDD_CA_${cd_write_ca_certificates__index}}\"" - while [ -n "${cd_write_ca_certificates__text}" ] ; do - cd_write_ca_certificates__path="\ -${CIDD_CA_ROOT}/${cd_write_ca_certificates__index}.crt" - cd_split - cd_write \ - "${cd_write_ca_certificates__path}" \ - "${cd_write_ca_certificates__text}" - cd_openssl "${cd_write_ca_certificates__path}" - cd_write_ca_certificates__index=$((cd_write_ca_certificates__index+1)) - eval "cd_write_ca_certificates__text=\ -\"\${CIDD_CA_${cd_write_ca_certificates__index}}\"" +cidd_write_ca_certificates () { + cidd_step "Write CA certificates" + cidd_mkdir "${CIDD_CA_ROOT}" + cidd_write_ca_certificates__index=1 + eval "cidd_write_ca_certificates__text=\ +\"\${CIDD_CA_${cidd_write_ca_certificates__index}}\"" + while [ -n "${cidd_write_ca_certificates__text}" ] ; do + cidd_write_ca_certificates__path="\ +${CIDD_CA_ROOT}/${cidd_write_ca_certificates__index}.crt" + cidd_split + cidd_write \ + "${cidd_write_ca_certificates__path}" \ + "${cidd_write_ca_certificates__text}" + cidd_openssl "${cidd_write_ca_certificates__path}" + cidd_write_ca_certificates__index=$((cidd_write_ca_certificates__index+1)) + eval "cidd_write_ca_certificates__text=\ +\"\${CIDD_CA_${cidd_write_ca_certificates__index}}\"" done } -cd_update_ca_certificates () { - cd_step "Update CA certificates" +cidd_update_ca_certificates () { + cidd_step "Update CA certificates" ${CIDD_CMD_CA} || exit } -cd_set_https_verification_on () { - cd_step "Set HTTPS verification on" - cd_rm "${CIDD_PM_HTTPS_PATH}" +cidd_set_https_verification_on () { + cidd_step "Set HTTPS verification on" + cidd_rm "${CIDD_PM_HTTPS_PATH}" } -cd_upgrade_packages () { - cd_step "Upgrade packages" +cidd_upgrade_packages () { + cidd_step "Upgrade packages" ${CIDD_PM_UPGRADE} || exit } -cd_install_git () { - cd_step "Install Git" - cd_install_package "${CIDD_PKG_GIT}" +cidd_install_git () { + cidd_step "Install Git" + cidd_install_package "${CIDD_PKG_GIT}" } -cd_install_python () { - cd_step "Install Python" - cd_install_package "${CIDD_PYTHON_PACKAGE}" - cd_split - cd_ln_python "${CIDD_PYTHON_COMMAND}" +cidd_install_python () { + cidd_step "Install Python" + cidd_install_package "${CIDD_PYTHON_PACKAGE}" + cidd_split + cidd_ln_python "${CIDD_PYTHON_COMMAND}" } # TODO move to Python -cd_install_rsync () { - cd_step "Install Rsync" - cd_install_package "${CIDD_PKG_RSYNC}" +cidd_install_rsync () { + cidd_step "Install Rsync" + cidd_install_package "${CIDD_PKG_RSYNC}" } # TODO move to Python -cd_install_ssh () { - cd_step "Install SSH" - cd_install_package "${CIDD_PKG_SSH}" +cidd_install_ssh () { + cidd_step "Install SSH" + cidd_install_package "${CIDD_PKG_SSH}" } -cd_clean_packages_cache () { - cd_step "Clean packages cache" +cidd_clean_packages_cache () { + cidd_step "Clean packages cache" ${CIDD_PM_CLEAN} || exit } -cd_install_python_modules () { - cd_step "Install Python modules" - cd_install_python_modules__root="$(mktemp --directory)" || exit - echo "→ ${cd_install_python_modules__root}" - for cd_install_python_modules__repository \ +cidd_install_python_modules () { + cidd_step "Install Python modules" + cidd_install_python_modules__root="$(mktemp --directory)" || exit + echo "→ ${cidd_install_python_modules__root}" + for cidd_install_python_modules__repository \ in "${CIDD_GIT_CHILD}" "${CIDD_GIT_PARENT}" ; do - cd_split - cd_install_python_modules__url="\ -${CIDD_PROJECTS_URL}/${cd_install_python_modules__repository}" + cidd_split + cidd_install_python_modules__url="\ +${CIDD_PROJECTS_URL}/${cidd_install_python_modules__repository}" echo "\ -${cd_install_python_modules__url} +${cidd_install_python_modules__url} ↓" git clone \ - "${cd_install_python_modules__url}" \ - "${cd_install_python_modules__root}\ -/${cd_install_python_modules__repository}" \ + "${cidd_install_python_modules__url}" \ + "${cidd_install_python_modules__root}\ +/${cidd_install_python_modules__repository}" \ || exit - cd_install_python_modules__path="\ -${cd_install_python_modules__root}\ -/${cd_install_python_modules__repository}\ -/${cd_install_python_modules__repository}" + cidd_install_python_modules__path="\ +${cidd_install_python_modules__root}\ +/${cidd_install_python_modules__repository}\ +/${cidd_install_python_modules__repository}" echo "\ -${cd_install_python_modules__path} +${cidd_install_python_modules__path} ↓ ${CIDD_PYTHON_PACKAGES}" cp --recursive \ - "${cd_install_python_modules__path}" "${CIDD_PYTHON_PACKAGES}" \ + "${cidd_install_python_modules__path}" "${CIDD_PYTHON_PACKAGES}" \ || exit done - cd_split - cd_ls "${CIDD_PYTHON_PACKAGES}" - cd_split - cd_rm "${cd_install_python_modules__root}" + cidd_split + cidd_ls "${CIDD_PYTHON_PACKAGES}" + cidd_split + cidd_rm "${cidd_install_python_modules__root}" } -cd_write_python_module () { - cd_step "Write Python module" - for cd_write_python_module__variable \ +cidd_write_python_module () { + cidd_step "Write Python module" + for cidd_write_python_module__variable \ in OPEN DOWN VERT SPLT __UP SHUT OS_ID OS_VERSION ; do - cd_write_python_module__value="\ -$(cd_echo "CIDD_${cd_write_python_module__variable}")" - cd_write_python_module__text="${cd_write_python_module__text}\ -${cd_write_python_module__value} + cidd_write_python_module__value="\ +$(cidd_echo "CIDD_${cidd_write_python_module__variable}")" + cidd_write_python_module__text="${cidd_write_python_module__text}\ +${cidd_write_python_module__value} " done - cd_write "${CIDD_PYTHON_PACKAGES}/env.py" "${cd_write_python_module__text}\ + cidd_write "${CIDD_PYTHON_PACKAGES}/env.py" "${cidd_write_python_module__text}\ CIDD_STEP = $((CIDD_STEP+1)) " } -cd_switch_to_python () { - cd_step "Switch to Python" +cidd_switch_to_python () { + cidd_step "Switch to Python" echo "\ ${CIDD_PATH} ↓ @@ -646,122 +646,122 @@ ${CIDD_PYTHON_PACKAGES}/${CIDD_GIT_CHILD}" # functions -cd_cat () { - cd_cat__file="${1}" - if [ -n "${cd_cat__file}" ] ; then - cd_open "${cd_cat__file}" - cat "${cd_cat__file}" || exit - cd_shut "${cd_cat__file}" +cidd_cat () { + cidd_cat__file="${1}" + if [ -n "${cidd_cat__file}" ] ; then + cidd_open "${cidd_cat__file}" + cat "${cidd_cat__file}" || exit + cidd_shut "${cidd_cat__file}" fi } -cd_echo () { +cidd_echo () { if [ -n "${1}" ] ; then - for cd_echo__name in "${@}" ; do - eval "cd_echo__text=\"\${${cd_echo__name}}\"" - echo "${cd_echo__name} = \"${cd_echo__text}\"" + for cidd_echo__name in "${@}" ; do + eval "cidd_echo__text=\"\${${cidd_echo__name}}\"" + echo "${cidd_echo__name} = \"${cidd_echo__text}\"" done fi } -cd_error_ci () { +cidd_error_ci () { echo "× CI: ${*}" exit "${CIDD_ERROR_CI}" } -cd_error_os () { - cd_error_os__variable="${1}" +cidd_error_os () { + cidd_error_os__variable="${1}" printf "× OS: " - cd_echo "${cd_error_os__variable}" + cidd_echo "${cidd_error_os__variable}" exit "${CIDD_ERROR_OS}" } -cd_grep_os () { - cd_grep_os__variable="${1}" - if [ -n "${cd_grep_os__variable}" ] ; then - grep "^${cd_grep_os__variable}=" "/etc/os-release" \ - | sed "s|^${cd_grep_os__variable}=||" \ +cidd_grep_os () { + cidd_grep_os__variable="${1}" + if [ -n "${cidd_grep_os__variable}" ] ; then + grep "^${cidd_grep_os__variable}=" "/etc/os-release" \ + | sed "s|^${cidd_grep_os__variable}=||" \ | sed "s|^\"\(.*\)\"$|\1|" fi } -cd_install_package () { - cd_install_package__name="${1}" - if [ -n "${cd_install_package__name}" ] ; then - ${CIDD_PM_INSTALL} "${cd_install_package__name}" || exit +cidd_install_package () { + cidd_install_package__name="${1}" + if [ -n "${cidd_install_package__name}" ] ; then + ${CIDD_PM_INSTALL} "${cidd_install_package__name}" || exit fi } -cd_ln_python () { - cd_ln_python__command="${1}" - if [ -n "${cd_ln_python__command}" ] ; then - echo "→ ${CIDD_PYTHON_ALIAS} → ${cd_ln_python__command}" - ln -f -s "${cd_ln_python__command}" "/usr/bin/${CIDD_PYTHON_ALIAS}" \ +cidd_ln_python () { + cidd_ln_python__command="${1}" + if [ -n "${cidd_ln_python__command}" ] ; then + echo "→ ${CIDD_PYTHON_ALIAS} → ${cidd_ln_python__command}" + ln -f -s "${cidd_ln_python__command}" "/usr/bin/${CIDD_PYTHON_ALIAS}" \ || exit fi } -cd_ls () { - cd_ls__path="${1}" - if [ -n "${cd_ls__path}" ] ; then - cd_open "${cd_ls__path}" - ls -a -l "${cd_ls__path}" || exit - cd_shut "${cd_ls__path}" +cidd_ls () { + cidd_ls__path="${1}" + if [ -n "${cidd_ls__path}" ] ; then + cidd_open "${cidd_ls__path}" + ls -a -l "${cidd_ls__path}" || exit + cidd_shut "${cidd_ls__path}" fi } -cd_mkdir () { - cd_mkdir__path="${1}" - if [ -n "${cd_mkdir__path}" ] ; then - echo "→ ${cd_mkdir__path}" - mkdir --parents "${cd_mkdir__path}" || exit +cidd_mkdir () { + cidd_mkdir__path="${1}" + if [ -n "${cidd_mkdir__path}" ] ; then + echo "→ ${cidd_mkdir__path}" + mkdir --parents "${cidd_mkdir__path}" || exit fi } -cd_open () { +cidd_open () { echo "${CIDD_OPEN}${*}" } -cd_openssl () { - cd_openssl__file="${1}" - if [ -f "${cd_openssl__file}" ] ; then +cidd_openssl () { + cidd_openssl__file="${1}" + if [ -f "${cidd_openssl__file}" ] ; then openssl x509 \ - -in "${cd_openssl__file}" \ + -in "${cidd_openssl__file}" \ -noout -text \ || exit fi } -cd_rm () { - cd_rm__path="${1}" - if [ -e "${cd_rm__path}" ] ; then - echo "← ${cd_rm__path}" - rm -r "${cd_rm__path}" || exit +cidd_rm () { + cidd_rm__path="${1}" + if [ -e "${cidd_rm__path}" ] ; then + echo "← ${cidd_rm__path}" + rm -r "${cidd_rm__path}" || exit fi } -cd_sed () { - cd_sed__file="${1}" +cidd_sed () { + cidd_sed__file="${1}" shift - if [ -f "${cd_sed__file}" ] ; then - cd_cat "${cd_sed__file}" - for cd_sed__regex in "${@}" ; do - sed --in-place "s${cd_sed__regex}g" "${cd_sed__file}" \ - && cd_cat "${cd_sed__file}" \ + if [ -f "${cidd_sed__file}" ] ; then + cidd_cat "${cidd_sed__file}" + for cidd_sed__regex in "${@}" ; do + sed --in-place "s${cidd_sed__regex}g" "${cidd_sed__file}" \ + && cidd_cat "${cidd_sed__file}" \ || exit done fi } -cd_shut () { +cidd_shut () { echo "${CIDD_SHUT}${*}" } -cd_split () { +cidd_split () { echo "${CIDD_SPLT}" } -cd_step () { +cidd_step () { CIDD_STEP=$((CIDD_STEP+1)) echo "\ ${CIDD_DOWN} @@ -769,14 +769,14 @@ ${CIDD_VERT} ${CIDD_STEP} ${*} ${CIDD___UP}" } -cd_write () { - cd_write__file="${1}" - cd_write__text="${2}" - if [ -n "${cd_write__file}" ] ; then - [ -f "${cd_write__file}" ] && cd_cat "${cd_write__file}" - echo "→ ${cd_write__file}" - printf "%s" "${cd_write__text}" > "${cd_write__file}" || exit - cd_cat "${cd_write__file}" +cidd_write () { + cidd_write__file="${1}" + cidd_write__text="${2}" + if [ -n "${cidd_write__file}" ] ; then + [ -f "${cidd_write__file}" ] && cidd_cat "${cidd_write__file}" + echo "→ ${cidd_write__file}" + printf "%s" "${cidd_write__text}" > "${cidd_write__file}" || exit + cidd_cat "${cidd_write__file}" fi } @@ -814,4 +814,4 @@ CIDD___UP="${CIDD_BOX_UP}${CIDD_HORIZONTAL}" CIDD_SHUT="${CIDD_BOX_UP}${CIDD_BOX_LEFT}" # run -cd_main "${@}" +cidd_main "${@}" From 3c2ef03f7e3c638ecede514cf989d5435cad262f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 21 Jun 2024 13:23:21 +0200 Subject: [PATCH 09/21] workflows/forgejo --- .forgejo/workflows/almalinux_8.yaml | 16 ++++++++-------- .forgejo/workflows/almalinux_9.yaml | 16 ++++++++-------- .forgejo/workflows/alpine_3.18.yaml | 16 ++++++++-------- .forgejo/workflows/alpine_3.19.yaml | 16 ++++++++-------- .../archlinux_base-20231112.0.191179.yaml | 16 ++++++++-------- .../archlinux_base-20240101.0.204074.yaml | 16 ++++++++-------- .forgejo/workflows/debian_bookworm.yaml | 18 +++++++++--------- .forgejo/workflows/debian_bullseye.yaml | 16 ++++++++-------- .forgejo/workflows/fedora_39.yaml | 16 ++++++++-------- .forgejo/workflows/fedora_40.yaml | 16 ++++++++-------- .forgejo/workflows/rockylinux_8.yaml | 16 ++++++++-------- .forgejo/workflows/rockylinux_9.yaml | 16 ++++++++-------- .forgejo/workflows/ubuntu_jammy.yaml | 16 ++++++++-------- .forgejo/workflows/ubuntu_noble.yaml | 16 ++++++++-------- 14 files changed, 113 insertions(+), 113 deletions(-) diff --git a/.forgejo/workflows/almalinux_8.yaml b/.forgejo/workflows/almalinux_8.yaml index fb4d018..fea586a 100644 --- a/.forgejo/workflows/almalinux_8.yaml +++ b/.forgejo/workflows/almalinux_8.yaml @@ -4,13 +4,13 @@ jobs: container: image: almalinux:8 steps: - - name: cd + - name: cidd run: > - ${{vars.CD}} - "${{secrets.CD_SSH_KEY}}" - "${{vars.CD_SSH_HOSTS}}" + ${{vars.CIDD}} + "${{secrets.CIDD_SSH_KEY}}" + "${{vars.CIDD_SSH_HOSTS}}" - - run: cd-list-environment - - run: cd-clone-branch - - run: cd-build-project - - run: cd-browse-workspace + - run: cidd-list-environment + - run: cidd-clone-branch + - run: cidd-build-project + - run: cidd-browse-workspace diff --git a/.forgejo/workflows/almalinux_9.yaml b/.forgejo/workflows/almalinux_9.yaml index 7649935..fa5ef03 100644 --- a/.forgejo/workflows/almalinux_9.yaml +++ b/.forgejo/workflows/almalinux_9.yaml @@ -4,13 +4,13 @@ jobs: container: image: almalinux:9 steps: - - name: cd + - name: cidd run: > - ${{vars.CD}} - "${{secrets.CD_SSH_KEY}}" - "${{vars.CD_SSH_HOSTS}}" + ${{vars.CIDD}} + "${{secrets.CIDD_SSH_KEY}}" + "${{vars.CIDD_SSH_HOSTS}}" - - run: cd-list-environment - - run: cd-clone-branch - - run: cd-build-project - - run: cd-browse-workspace + - run: cidd-list-environment + - run: cidd-clone-branch + - run: cidd-build-project + - run: cidd-browse-workspace diff --git a/.forgejo/workflows/alpine_3.18.yaml b/.forgejo/workflows/alpine_3.18.yaml index 1bbe564..c9f284c 100644 --- a/.forgejo/workflows/alpine_3.18.yaml +++ b/.forgejo/workflows/alpine_3.18.yaml @@ -4,13 +4,13 @@ jobs: container: image: alpine:3.18 steps: - - name: cd + - name: cidd run: > - ${{vars.CD}} - "${{secrets.CD_SSH_KEY}}" - "${{vars.CD_SSH_HOSTS}}" + ${{vars.CIDD}} + "${{secrets.CIDD_SSH_KEY}}" + "${{vars.CIDD_SSH_HOSTS}}" - - run: cd-list-environment - - run: cd-clone-branch - - run: cd-build-project - - run: cd-browse-workspace + - run: cidd-list-environment + - run: cidd-clone-branch + - run: cidd-build-project + - run: cidd-browse-workspace diff --git a/.forgejo/workflows/alpine_3.19.yaml b/.forgejo/workflows/alpine_3.19.yaml index 20878f5..8a2e539 100644 --- a/.forgejo/workflows/alpine_3.19.yaml +++ b/.forgejo/workflows/alpine_3.19.yaml @@ -4,13 +4,13 @@ jobs: container: image: alpine:3.19 steps: - - name: cd + - name: cidd run: > - ${{vars.CD}} - "${{secrets.CD_SSH_KEY}}" - "${{vars.CD_SSH_HOSTS}}" + ${{vars.CIDD}} + "${{secrets.CIDD_SSH_KEY}}" + "${{vars.CIDD_SSH_HOSTS}}" - - run: cd-list-environment - - run: cd-clone-branch - - run: cd-build-project - - run: cd-browse-workspace + - run: cidd-list-environment + - run: cidd-clone-branch + - run: cidd-build-project + - run: cidd-browse-workspace diff --git a/.forgejo/workflows/archlinux_base-20231112.0.191179.yaml b/.forgejo/workflows/archlinux_base-20231112.0.191179.yaml index 880bf86..1fb534e 100644 --- a/.forgejo/workflows/archlinux_base-20231112.0.191179.yaml +++ b/.forgejo/workflows/archlinux_base-20231112.0.191179.yaml @@ -4,13 +4,13 @@ jobs: container: image: archlinux:base-20231112.0.191179 steps: - - name: cd + - name: cidd run: > - ${{vars.CD}} - "${{secrets.CD_SSH_KEY}}" - "${{vars.CD_SSH_HOSTS}}" + ${{vars.CIDD}} + "${{secrets.CIDD_SSH_KEY}}" + "${{vars.CIDD_SSH_HOSTS}}" - - run: cd-list-environment - - run: cd-clone-branch - - run: cd-build-project - - run: cd-browse-workspace + - run: cidd-list-environment + - run: cidd-clone-branch + - run: cidd-build-project + - run: cidd-browse-workspace diff --git a/.forgejo/workflows/archlinux_base-20240101.0.204074.yaml b/.forgejo/workflows/archlinux_base-20240101.0.204074.yaml index d2fddec..01308a0 100644 --- a/.forgejo/workflows/archlinux_base-20240101.0.204074.yaml +++ b/.forgejo/workflows/archlinux_base-20240101.0.204074.yaml @@ -4,13 +4,13 @@ jobs: container: image: archlinux:base-20240101.0.204074 steps: - - name: cd + - name: cidd run: > - ${{vars.CD}} - "${{secrets.CD_SSH_KEY}}" - "${{vars.CD_SSH_HOSTS}}" + ${{vars.CIDD}} + "${{secrets.CIDD_SSH_KEY}}" + "${{vars.CIDD_SSH_HOSTS}}" - - run: cd-list-environment - - run: cd-clone-branch - - run: cd-build-project - - run: cd-browse-workspace + - run: cidd-list-environment + - run: cidd-clone-branch + - run: cidd-build-project + - run: cidd-browse-workspace diff --git a/.forgejo/workflows/debian_bookworm.yaml b/.forgejo/workflows/debian_bookworm.yaml index 6140d04..14e2fcd 100644 --- a/.forgejo/workflows/debian_bookworm.yaml +++ b/.forgejo/workflows/debian_bookworm.yaml @@ -4,14 +4,14 @@ jobs: container: image: debian:bookworm steps: - - name: cd + - name: cidd run: > - ${{vars.CD}} - "${{secrets.CD_SSH_KEY}}" - "${{vars.CD_SSH_HOSTS}}" + ${{vars.CIDD}} + "${{secrets.CIDD_SSH_KEY}}" + "${{vars.CIDD_SSH_HOSTS}}" - - run: cd-list-environment - - run: cd-clone-branch - - run: cd-build-project - - run: cd-browse-workspace - - run: cd-synchronize + - run: cidd-list-environment + - run: cidd-clone-branch + - run: cidd-build-project + - run: cidd-browse-workspace + - run: cidd-synchronize diff --git a/.forgejo/workflows/debian_bullseye.yaml b/.forgejo/workflows/debian_bullseye.yaml index 97d5d83..bae043d 100644 --- a/.forgejo/workflows/debian_bullseye.yaml +++ b/.forgejo/workflows/debian_bullseye.yaml @@ -4,13 +4,13 @@ jobs: container: image: debian:bullseye steps: - - name: cd + - name: cidd run: > - ${{vars.CD}} - "${{secrets.CD_SSH_KEY}}" - "${{vars.CD_SSH_HOSTS}}" + ${{vars.CIDD}} + "${{secrets.CIDD_SSH_KEY}}" + "${{vars.CIDD_SSH_HOSTS}}" - - run: cd-list-environment - - run: cd-clone-branch - - run: cd-build-project - - run: cd-browse-workspace + - run: cidd-list-environment + - run: cidd-clone-branch + - run: cidd-build-project + - run: cidd-browse-workspace diff --git a/.forgejo/workflows/fedora_39.yaml b/.forgejo/workflows/fedora_39.yaml index 80086d0..da70bd7 100644 --- a/.forgejo/workflows/fedora_39.yaml +++ b/.forgejo/workflows/fedora_39.yaml @@ -4,13 +4,13 @@ jobs: container: image: fedora:39 steps: - - name: cd + - name: cidd run: > - ${{vars.CD}} - "${{secrets.CD_SSH_KEY}}" - "${{vars.CD_SSH_HOSTS}}" + ${{vars.CIDD}} + "${{secrets.CIDD_SSH_KEY}}" + "${{vars.CIDD_SSH_HOSTS}}" - - run: cd-list-environment - - run: cd-clone-branch - - run: cd-build-project - - run: cd-browse-workspace + - run: cidd-list-environment + - run: cidd-clone-branch + - run: cidd-build-project + - run: cidd-browse-workspace diff --git a/.forgejo/workflows/fedora_40.yaml b/.forgejo/workflows/fedora_40.yaml index 3df0e41..a3229d8 100644 --- a/.forgejo/workflows/fedora_40.yaml +++ b/.forgejo/workflows/fedora_40.yaml @@ -4,13 +4,13 @@ jobs: container: image: fedora:40 steps: - - name: cd + - name: cidd run: > - ${{vars.CD}} - "${{secrets.CD_SSH_KEY}}" - "${{vars.CD_SSH_HOSTS}}" + ${{vars.CIDD}} + "${{secrets.CIDD_SSH_KEY}}" + "${{vars.CIDD_SSH_HOSTS}}" - - run: cd-list-environment - - run: cd-clone-branch - - run: cd-build-project - - run: cd-browse-workspace + - run: cidd-list-environment + - run: cidd-clone-branch + - run: cidd-build-project + - run: cidd-browse-workspace diff --git a/.forgejo/workflows/rockylinux_8.yaml b/.forgejo/workflows/rockylinux_8.yaml index 77d9bea..a4ab180 100644 --- a/.forgejo/workflows/rockylinux_8.yaml +++ b/.forgejo/workflows/rockylinux_8.yaml @@ -4,13 +4,13 @@ jobs: container: image: rockylinux:8 steps: - - name: cd + - name: cidd run: > - ${{vars.CD}} - "${{secrets.CD_SSH_KEY}}" - "${{vars.CD_SSH_HOSTS}}" + ${{vars.CIDD}} + "${{secrets.CIDD_SSH_KEY}}" + "${{vars.CIDD_SSH_HOSTS}}" - - run: cd-list-environment - - run: cd-clone-branch - - run: cd-build-project - - run: cd-browse-workspace + - run: cidd-list-environment + - run: cidd-clone-branch + - run: cidd-build-project + - run: cidd-browse-workspace diff --git a/.forgejo/workflows/rockylinux_9.yaml b/.forgejo/workflows/rockylinux_9.yaml index 09b1e62..ade91f1 100644 --- a/.forgejo/workflows/rockylinux_9.yaml +++ b/.forgejo/workflows/rockylinux_9.yaml @@ -4,13 +4,13 @@ jobs: container: image: rockylinux:9 steps: - - name: cd + - name: cidd run: > - ${{vars.CD}} - "${{secrets.CD_SSH_KEY}}" - "${{vars.CD_SSH_HOSTS}}" + ${{vars.CIDD}} + "${{secrets.CIDD_SSH_KEY}}" + "${{vars.CIDD_SSH_HOSTS}}" - - run: cd-list-environment - - run: cd-clone-branch - - run: cd-build-project - - run: cd-browse-workspace + - run: cidd-list-environment + - run: cidd-clone-branch + - run: cidd-build-project + - run: cidd-browse-workspace diff --git a/.forgejo/workflows/ubuntu_jammy.yaml b/.forgejo/workflows/ubuntu_jammy.yaml index c4c3a2e..35c94da 100644 --- a/.forgejo/workflows/ubuntu_jammy.yaml +++ b/.forgejo/workflows/ubuntu_jammy.yaml @@ -4,13 +4,13 @@ jobs: container: image: ubuntu:jammy steps: - - name: cd + - name: cidd run: > - ${{vars.CD}} - "${{secrets.CD_SSH_KEY}}" - "${{vars.CD_SSH_HOSTS}}" + ${{vars.CIDD}} + "${{secrets.CIDD_SSH_KEY}}" + "${{vars.CIDD_SSH_HOSTS}}" - - run: cd-list-environment - - run: cd-clone-branch - - run: cd-build-project - - run: cd-browse-workspace + - run: cidd-list-environment + - run: cidd-clone-branch + - run: cidd-build-project + - run: cidd-browse-workspace diff --git a/.forgejo/workflows/ubuntu_noble.yaml b/.forgejo/workflows/ubuntu_noble.yaml index e7f0818..fcee748 100644 --- a/.forgejo/workflows/ubuntu_noble.yaml +++ b/.forgejo/workflows/ubuntu_noble.yaml @@ -4,13 +4,13 @@ jobs: container: image: ubuntu:noble steps: - - name: cd + - name: cidd run: > - ${{vars.CD}} - "${{secrets.CD_SSH_KEY}}" - "${{vars.CD_SSH_HOSTS}}" + ${{vars.CIDD}} + "${{secrets.CIDD_SSH_KEY}}" + "${{vars.CIDD_SSH_HOSTS}}" - - run: cd-list-environment - - run: cd-clone-branch - - run: cd-build-project - - run: cd-browse-workspace + - run: cidd-list-environment + - run: cidd-clone-branch + - run: cidd-build-project + - run: cidd-browse-workspace From 2e3f12e2ba3c2ef839b6cee4de39f06c13060437 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 21 Jun 2024 13:24:05 +0200 Subject: [PATCH 10/21] workflows/github --- .github/workflows/debian:bookworm.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/debian:bookworm.yaml b/.github/workflows/debian:bookworm.yaml index a0c0b26..ae792ac 100644 --- a/.github/workflows/debian:bookworm.yaml +++ b/.github/workflows/debian:bookworm.yaml @@ -5,14 +5,14 @@ jobs: container: image: debian:bookworm steps: - - name: cd + - name: cidd run: > - echo '${{vars.CD}}' | tr -d '\r' | sh -s - "${{secrets.CD_SSH_KEY}}" - "${{vars.CD_SSH_HOSTS}}" + echo '${{vars.CIDD}}' | tr -d '\r' | sh -s + "${{secrets.CIDD_SSH_KEY}}" + "${{vars.CIDD_SSH_HOSTS}}" - - run: cd-list-environment - - run: cd-clone-branch - - run: cd-build-project - - run: cd-browse-workspace - - run: cd-synchronize + - run: cidd-list-environment + - run: cidd-clone-branch + - run: cidd-build-project + - run: cidd-browse-workspace + - run: cidd-synchronize From f14131226ce1d5c2c81bc3a8b5a68dbab419cbcc Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 21 Jun 2024 13:25:26 +0200 Subject: [PATCH 11/21] workflows/gitlab --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae03c2b..012af4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,11 +2,11 @@ image: debian:bookworm job: script: - > - sh ${CD} - ${CD_SSH_KEY} - ${CD_SSH_HOSTS} + sh ${CIDD} + ${CIDD_SSH_KEY} + ${CIDD_SSH_HOSTS} - - cd-list-environment - - cd-clone-branch - - cd-build-project - - cd-browse-workspace + - cidd-list-environment + - cidd-clone-branch + - cidd-build-project + - cidd-browse-workspace From f448d71b9564d1d6779087e881566db9db229d61 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 21 Jun 2024 13:29:18 +0200 Subject: [PATCH 12/21] readme --- readme.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/readme.md b/readme.md index 23e8484..d4d6730 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ -# Continuous Deployment +# Continuous Integration, Delivery & Deployment -Get a common set of Python CI/CD commands \ +Get a common set of Python CI & CD commands \ from various contexts of CA, CI and OCI / OS. ## Features @@ -39,21 +39,21 @@ from various contexts of CA, CI and OCI / OS. ## How -| Variable | Description | Default | -|:--------------|:------------------------|:--------------------------------| -| CD_CA_n | Numbered CA certificate | | -| CD_DNS | Space separated servers | 9.9.9.9 | -| CD_GIT_CHILD | Child Git repository | cd | -| CD_GIT_PARENT | Parent Git repository | rwx | -| CD_SSH_HOSTS | domain.tld ssh-type pub | | -| CD_SSH_KEY | SSH private key | | -| CD_URL_ALMA | Alma repository URL | https://repo.almalinux.org | -| CD_URL_ALPINE | Alpine repository URL | https://dl-cdn.alpinelinux.org | -| CD_URL_ARCH | Arch repository URL | https://geo.mirror.pkgbuild.com | -| CD_URL_DEBIAN | Debian repository URL | https://deb.debian.org | -| CD_URL_FEDORA | Fedora repository URL | https://rpmfind.net | -| CD_URL_ROCKY | Rocky repository URL | https://dl.rockylinux.org | -| CD_URL_UBUNTU | Ubuntu repository URL | https://ubuntu.mirrors.ovh.net | +| Variable | Description | Default | +|:----------------|:------------------------|:--------------------------------| +| CIDD_CA_n | Numbered CA certificate | | +| CIDD_DNS | Space separated servers | 9.9.9.9 | +| CIDD_GIT_CHILD | Child Git repository | cidd | +| CIDD_GIT_PARENT | Parent Git repository | rwx | +| CIDD_SSH_HOSTS | domain.tld ssh-type pub | | +| CIDD_SSH_KEY | SSH private key | | +| CIDD_URL_ALMA | Alma repository URL | https://repo.almalinux.org | +| CIDD_URL_ALPINE | Alpine repository URL | https://dl-cdn.alpinelinux.org | +| CIDD_URL_ARCH | Arch repository URL | https://geo.mirror.pkgbuild.com | +| CIDD_URL_DEBIAN | Debian repository URL | https://deb.debian.org | +| CIDD_URL_FEDORA | Fedora repository URL | https://rpmfind.net | +| CIDD_URL_ROCKY | Rocky repository URL | https://dl.rockylinux.org | +| CIDD_URL_UBUNTU | Ubuntu repository URL | https://ubuntu.mirrors.ovh.net | ## HTTPS & Python From c5c01f14cb477b32bc2eae4379555d21a6c70654 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 21 Jun 2024 13:30:23 +0200 Subject: [PATCH 13/21] pyproject --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6027135..994bfc7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,11 +15,11 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = ["rwx"] -description = "Continuous Deployment" +description = "Continuous Integration, Delivery & Deployment" dynamic = ["version"] keywords = [] license-files = { paths = ["license.md"] } -name = "cd" +name = "cidd" readme = "readme.md" requires-python = ">= 3.10" @@ -29,7 +29,7 @@ requires-python = ">= 3.10" [project.urls] [tool.hatch.version] -path = "cd/__init__.py" +path = "cidd/__init__.py" [tool.ruff] line-length = 80 From 42c05eecb73a8339afef6ba4f52a775a741901d3 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 21 Jun 2024 14:54:36 +0200 Subject: [PATCH 14/21] mv --- cidd.sh => pidd.sh | 0 {cidd => pidd}/__init__.py | 0 {cidd => pidd}/__main__.py | 0 {cidd => pidd}/project.py | 0 {cidd => pidd}/projects.py | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename cidd.sh => pidd.sh (100%) rename {cidd => pidd}/__init__.py (100%) rename {cidd => pidd}/__main__.py (100%) rename {cidd => pidd}/project.py (100%) rename {cidd => pidd}/projects.py (100%) diff --git a/cidd.sh b/pidd.sh similarity index 100% rename from cidd.sh rename to pidd.sh diff --git a/cidd/__init__.py b/pidd/__init__.py similarity index 100% rename from cidd/__init__.py rename to pidd/__init__.py diff --git a/cidd/__main__.py b/pidd/__main__.py similarity index 100% rename from cidd/__main__.py rename to pidd/__main__.py diff --git a/cidd/project.py b/pidd/project.py similarity index 100% rename from cidd/project.py rename to pidd/project.py diff --git a/cidd/projects.py b/pidd/projects.py similarity index 100% rename from cidd/projects.py rename to pidd/projects.py From 9f12c01057a092afa35b88fc6925f70c301f5c3c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 21 Jun 2024 14:57:57 +0200 Subject: [PATCH 15/21] =?UTF-8?q?cidd=20=E2=86=92=20pidd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .forgejo/workflows/almalinux_8.yaml | 16 +- .forgejo/workflows/almalinux_9.yaml | 16 +- .forgejo/workflows/alpine_3.18.yaml | 16 +- .forgejo/workflows/alpine_3.19.yaml | 16 +- .../archlinux_base-20231112.0.191179.yaml | 16 +- .../archlinux_base-20240101.0.204074.yaml | 16 +- .forgejo/workflows/debian_bookworm.yaml | 18 +- .forgejo/workflows/debian_bullseye.yaml | 16 +- .forgejo/workflows/fedora_39.yaml | 16 +- .forgejo/workflows/fedora_40.yaml | 16 +- .forgejo/workflows/rockylinux_8.yaml | 16 +- .forgejo/workflows/rockylinux_9.yaml | 16 +- .forgejo/workflows/ubuntu_jammy.yaml | 16 +- .forgejo/workflows/ubuntu_noble.yaml | 16 +- .github/workflows/debian:bookworm.yaml | 18 +- .gitlab-ci.yml | 14 +- pidd.sh | 996 +++++++++--------- pidd/__init__.py | 38 +- pidd/__main__.py | 4 +- pidd/project.py | 2 +- pyproject.toml | 4 +- readme.md | 26 +- 22 files changed, 664 insertions(+), 664 deletions(-) diff --git a/.forgejo/workflows/almalinux_8.yaml b/.forgejo/workflows/almalinux_8.yaml index fea586a..98d5c0d 100644 --- a/.forgejo/workflows/almalinux_8.yaml +++ b/.forgejo/workflows/almalinux_8.yaml @@ -4,13 +4,13 @@ jobs: container: image: almalinux:8 steps: - - name: cidd + - name: pidd run: > - ${{vars.CIDD}} - "${{secrets.CIDD_SSH_KEY}}" - "${{vars.CIDD_SSH_HOSTS}}" + ${{vars.PIDD}} + "${{secrets.PIDD_SSH_KEY}}" + "${{vars.PIDD_SSH_HOSTS}}" - - run: cidd-list-environment - - run: cidd-clone-branch - - run: cidd-build-project - - run: cidd-browse-workspace + - run: pidd-list-environment + - run: pidd-clone-branch + - run: pidd-build-project + - run: pidd-browse-workspace diff --git a/.forgejo/workflows/almalinux_9.yaml b/.forgejo/workflows/almalinux_9.yaml index fa5ef03..9355241 100644 --- a/.forgejo/workflows/almalinux_9.yaml +++ b/.forgejo/workflows/almalinux_9.yaml @@ -4,13 +4,13 @@ jobs: container: image: almalinux:9 steps: - - name: cidd + - name: pidd run: > - ${{vars.CIDD}} - "${{secrets.CIDD_SSH_KEY}}" - "${{vars.CIDD_SSH_HOSTS}}" + ${{vars.PIDD}} + "${{secrets.PIDD_SSH_KEY}}" + "${{vars.PIDD_SSH_HOSTS}}" - - run: cidd-list-environment - - run: cidd-clone-branch - - run: cidd-build-project - - run: cidd-browse-workspace + - run: pidd-list-environment + - run: pidd-clone-branch + - run: pidd-build-project + - run: pidd-browse-workspace diff --git a/.forgejo/workflows/alpine_3.18.yaml b/.forgejo/workflows/alpine_3.18.yaml index c9f284c..0a1fd7f 100644 --- a/.forgejo/workflows/alpine_3.18.yaml +++ b/.forgejo/workflows/alpine_3.18.yaml @@ -4,13 +4,13 @@ jobs: container: image: alpine:3.18 steps: - - name: cidd + - name: pidd run: > - ${{vars.CIDD}} - "${{secrets.CIDD_SSH_KEY}}" - "${{vars.CIDD_SSH_HOSTS}}" + ${{vars.PIDD}} + "${{secrets.PIDD_SSH_KEY}}" + "${{vars.PIDD_SSH_HOSTS}}" - - run: cidd-list-environment - - run: cidd-clone-branch - - run: cidd-build-project - - run: cidd-browse-workspace + - run: pidd-list-environment + - run: pidd-clone-branch + - run: pidd-build-project + - run: pidd-browse-workspace diff --git a/.forgejo/workflows/alpine_3.19.yaml b/.forgejo/workflows/alpine_3.19.yaml index 8a2e539..6a736bc 100644 --- a/.forgejo/workflows/alpine_3.19.yaml +++ b/.forgejo/workflows/alpine_3.19.yaml @@ -4,13 +4,13 @@ jobs: container: image: alpine:3.19 steps: - - name: cidd + - name: pidd run: > - ${{vars.CIDD}} - "${{secrets.CIDD_SSH_KEY}}" - "${{vars.CIDD_SSH_HOSTS}}" + ${{vars.PIDD}} + "${{secrets.PIDD_SSH_KEY}}" + "${{vars.PIDD_SSH_HOSTS}}" - - run: cidd-list-environment - - run: cidd-clone-branch - - run: cidd-build-project - - run: cidd-browse-workspace + - run: pidd-list-environment + - run: pidd-clone-branch + - run: pidd-build-project + - run: pidd-browse-workspace diff --git a/.forgejo/workflows/archlinux_base-20231112.0.191179.yaml b/.forgejo/workflows/archlinux_base-20231112.0.191179.yaml index 1fb534e..484465a 100644 --- a/.forgejo/workflows/archlinux_base-20231112.0.191179.yaml +++ b/.forgejo/workflows/archlinux_base-20231112.0.191179.yaml @@ -4,13 +4,13 @@ jobs: container: image: archlinux:base-20231112.0.191179 steps: - - name: cidd + - name: pidd run: > - ${{vars.CIDD}} - "${{secrets.CIDD_SSH_KEY}}" - "${{vars.CIDD_SSH_HOSTS}}" + ${{vars.PIDD}} + "${{secrets.PIDD_SSH_KEY}}" + "${{vars.PIDD_SSH_HOSTS}}" - - run: cidd-list-environment - - run: cidd-clone-branch - - run: cidd-build-project - - run: cidd-browse-workspace + - run: pidd-list-environment + - run: pidd-clone-branch + - run: pidd-build-project + - run: pidd-browse-workspace diff --git a/.forgejo/workflows/archlinux_base-20240101.0.204074.yaml b/.forgejo/workflows/archlinux_base-20240101.0.204074.yaml index 01308a0..3de46f0 100644 --- a/.forgejo/workflows/archlinux_base-20240101.0.204074.yaml +++ b/.forgejo/workflows/archlinux_base-20240101.0.204074.yaml @@ -4,13 +4,13 @@ jobs: container: image: archlinux:base-20240101.0.204074 steps: - - name: cidd + - name: pidd run: > - ${{vars.CIDD}} - "${{secrets.CIDD_SSH_KEY}}" - "${{vars.CIDD_SSH_HOSTS}}" + ${{vars.PIDD}} + "${{secrets.PIDD_SSH_KEY}}" + "${{vars.PIDD_SSH_HOSTS}}" - - run: cidd-list-environment - - run: cidd-clone-branch - - run: cidd-build-project - - run: cidd-browse-workspace + - run: pidd-list-environment + - run: pidd-clone-branch + - run: pidd-build-project + - run: pidd-browse-workspace diff --git a/.forgejo/workflows/debian_bookworm.yaml b/.forgejo/workflows/debian_bookworm.yaml index 14e2fcd..4bc47bc 100644 --- a/.forgejo/workflows/debian_bookworm.yaml +++ b/.forgejo/workflows/debian_bookworm.yaml @@ -4,14 +4,14 @@ jobs: container: image: debian:bookworm steps: - - name: cidd + - name: pidd run: > - ${{vars.CIDD}} - "${{secrets.CIDD_SSH_KEY}}" - "${{vars.CIDD_SSH_HOSTS}}" + ${{vars.PIDD}} + "${{secrets.PIDD_SSH_KEY}}" + "${{vars.PIDD_SSH_HOSTS}}" - - run: cidd-list-environment - - run: cidd-clone-branch - - run: cidd-build-project - - run: cidd-browse-workspace - - run: cidd-synchronize + - run: pidd-list-environment + - run: pidd-clone-branch + - run: pidd-build-project + - run: pidd-browse-workspace + - run: pidd-synchronize diff --git a/.forgejo/workflows/debian_bullseye.yaml b/.forgejo/workflows/debian_bullseye.yaml index bae043d..8d5289e 100644 --- a/.forgejo/workflows/debian_bullseye.yaml +++ b/.forgejo/workflows/debian_bullseye.yaml @@ -4,13 +4,13 @@ jobs: container: image: debian:bullseye steps: - - name: cidd + - name: pidd run: > - ${{vars.CIDD}} - "${{secrets.CIDD_SSH_KEY}}" - "${{vars.CIDD_SSH_HOSTS}}" + ${{vars.PIDD}} + "${{secrets.PIDD_SSH_KEY}}" + "${{vars.PIDD_SSH_HOSTS}}" - - run: cidd-list-environment - - run: cidd-clone-branch - - run: cidd-build-project - - run: cidd-browse-workspace + - run: pidd-list-environment + - run: pidd-clone-branch + - run: pidd-build-project + - run: pidd-browse-workspace diff --git a/.forgejo/workflows/fedora_39.yaml b/.forgejo/workflows/fedora_39.yaml index da70bd7..9d55290 100644 --- a/.forgejo/workflows/fedora_39.yaml +++ b/.forgejo/workflows/fedora_39.yaml @@ -4,13 +4,13 @@ jobs: container: image: fedora:39 steps: - - name: cidd + - name: pidd run: > - ${{vars.CIDD}} - "${{secrets.CIDD_SSH_KEY}}" - "${{vars.CIDD_SSH_HOSTS}}" + ${{vars.PIDD}} + "${{secrets.PIDD_SSH_KEY}}" + "${{vars.PIDD_SSH_HOSTS}}" - - run: cidd-list-environment - - run: cidd-clone-branch - - run: cidd-build-project - - run: cidd-browse-workspace + - run: pidd-list-environment + - run: pidd-clone-branch + - run: pidd-build-project + - run: pidd-browse-workspace diff --git a/.forgejo/workflows/fedora_40.yaml b/.forgejo/workflows/fedora_40.yaml index a3229d8..5eda681 100644 --- a/.forgejo/workflows/fedora_40.yaml +++ b/.forgejo/workflows/fedora_40.yaml @@ -4,13 +4,13 @@ jobs: container: image: fedora:40 steps: - - name: cidd + - name: pidd run: > - ${{vars.CIDD}} - "${{secrets.CIDD_SSH_KEY}}" - "${{vars.CIDD_SSH_HOSTS}}" + ${{vars.PIDD}} + "${{secrets.PIDD_SSH_KEY}}" + "${{vars.PIDD_SSH_HOSTS}}" - - run: cidd-list-environment - - run: cidd-clone-branch - - run: cidd-build-project - - run: cidd-browse-workspace + - run: pidd-list-environment + - run: pidd-clone-branch + - run: pidd-build-project + - run: pidd-browse-workspace diff --git a/.forgejo/workflows/rockylinux_8.yaml b/.forgejo/workflows/rockylinux_8.yaml index a4ab180..7909b85 100644 --- a/.forgejo/workflows/rockylinux_8.yaml +++ b/.forgejo/workflows/rockylinux_8.yaml @@ -4,13 +4,13 @@ jobs: container: image: rockylinux:8 steps: - - name: cidd + - name: pidd run: > - ${{vars.CIDD}} - "${{secrets.CIDD_SSH_KEY}}" - "${{vars.CIDD_SSH_HOSTS}}" + ${{vars.PIDD}} + "${{secrets.PIDD_SSH_KEY}}" + "${{vars.PIDD_SSH_HOSTS}}" - - run: cidd-list-environment - - run: cidd-clone-branch - - run: cidd-build-project - - run: cidd-browse-workspace + - run: pidd-list-environment + - run: pidd-clone-branch + - run: pidd-build-project + - run: pidd-browse-workspace diff --git a/.forgejo/workflows/rockylinux_9.yaml b/.forgejo/workflows/rockylinux_9.yaml index ade91f1..201e082 100644 --- a/.forgejo/workflows/rockylinux_9.yaml +++ b/.forgejo/workflows/rockylinux_9.yaml @@ -4,13 +4,13 @@ jobs: container: image: rockylinux:9 steps: - - name: cidd + - name: pidd run: > - ${{vars.CIDD}} - "${{secrets.CIDD_SSH_KEY}}" - "${{vars.CIDD_SSH_HOSTS}}" + ${{vars.PIDD}} + "${{secrets.PIDD_SSH_KEY}}" + "${{vars.PIDD_SSH_HOSTS}}" - - run: cidd-list-environment - - run: cidd-clone-branch - - run: cidd-build-project - - run: cidd-browse-workspace + - run: pidd-list-environment + - run: pidd-clone-branch + - run: pidd-build-project + - run: pidd-browse-workspace diff --git a/.forgejo/workflows/ubuntu_jammy.yaml b/.forgejo/workflows/ubuntu_jammy.yaml index 35c94da..0b57630 100644 --- a/.forgejo/workflows/ubuntu_jammy.yaml +++ b/.forgejo/workflows/ubuntu_jammy.yaml @@ -4,13 +4,13 @@ jobs: container: image: ubuntu:jammy steps: - - name: cidd + - name: pidd run: > - ${{vars.CIDD}} - "${{secrets.CIDD_SSH_KEY}}" - "${{vars.CIDD_SSH_HOSTS}}" + ${{vars.PIDD}} + "${{secrets.PIDD_SSH_KEY}}" + "${{vars.PIDD_SSH_HOSTS}}" - - run: cidd-list-environment - - run: cidd-clone-branch - - run: cidd-build-project - - run: cidd-browse-workspace + - run: pidd-list-environment + - run: pidd-clone-branch + - run: pidd-build-project + - run: pidd-browse-workspace diff --git a/.forgejo/workflows/ubuntu_noble.yaml b/.forgejo/workflows/ubuntu_noble.yaml index fcee748..58950cc 100644 --- a/.forgejo/workflows/ubuntu_noble.yaml +++ b/.forgejo/workflows/ubuntu_noble.yaml @@ -4,13 +4,13 @@ jobs: container: image: ubuntu:noble steps: - - name: cidd + - name: pidd run: > - ${{vars.CIDD}} - "${{secrets.CIDD_SSH_KEY}}" - "${{vars.CIDD_SSH_HOSTS}}" + ${{vars.PIDD}} + "${{secrets.PIDD_SSH_KEY}}" + "${{vars.PIDD_SSH_HOSTS}}" - - run: cidd-list-environment - - run: cidd-clone-branch - - run: cidd-build-project - - run: cidd-browse-workspace + - run: pidd-list-environment + - run: pidd-clone-branch + - run: pidd-build-project + - run: pidd-browse-workspace diff --git a/.github/workflows/debian:bookworm.yaml b/.github/workflows/debian:bookworm.yaml index ae792ac..9790b19 100644 --- a/.github/workflows/debian:bookworm.yaml +++ b/.github/workflows/debian:bookworm.yaml @@ -5,14 +5,14 @@ jobs: container: image: debian:bookworm steps: - - name: cidd + - name: pidd run: > - echo '${{vars.CIDD}}' | tr -d '\r' | sh -s - "${{secrets.CIDD_SSH_KEY}}" - "${{vars.CIDD_SSH_HOSTS}}" + echo '${{vars.PIDD}}' | tr -d '\r' | sh -s + "${{secrets.PIDD_SSH_KEY}}" + "${{vars.PIDD_SSH_HOSTS}}" - - run: cidd-list-environment - - run: cidd-clone-branch - - run: cidd-build-project - - run: cidd-browse-workspace - - run: cidd-synchronize + - run: pidd-list-environment + - run: pidd-clone-branch + - run: pidd-build-project + - run: pidd-browse-workspace + - run: pidd-synchronize diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 012af4b..adab647 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,11 +2,11 @@ image: debian:bookworm job: script: - > - sh ${CIDD} - ${CIDD_SSH_KEY} - ${CIDD_SSH_HOSTS} + sh ${PIDD} + ${PIDD_SSH_KEY} + ${PIDD_SSH_HOSTS} - - cidd-list-environment - - cidd-clone-branch - - cidd-build-project - - cidd-browse-workspace + - pidd-list-environment + - pidd-clone-branch + - pidd-build-project + - pidd-browse-workspace diff --git a/pidd.sh b/pidd.sh index 111b73c..83d40b9 100644 --- a/pidd.sh +++ b/pidd.sh @@ -1,176 +1,176 @@ #! /usr/bin/env sh # defaults -[ -n "${CIDD_DNS}" ] || CIDD_DNS="\ +[ -n "${PIDD_DNS}" ] || PIDD_DNS="\ 9.9.9.9 \ " -[ -n "${CIDD_GIT_CHILD}" ] || CIDD_GIT_CHILD="cd" -[ -n "${CIDD_GIT_PARENT}" ] || CIDD_GIT_PARENT="rwx" +[ -n "${PIDD_GIT_CHILD}" ] || PIDD_GIT_CHILD="cd" +[ -n "${PIDD_GIT_PARENT}" ] || PIDD_GIT_PARENT="rwx" # main -cidd_main () { - cidd_set_environment_variables - cidd_set_packages_repositories - cidd_set_packages_configuration +pidd_main () { + pidd_set_environment_variables + pidd_set_packages_repositories + pidd_set_packages_configuration # - cidd_list_working_directory - cidd_set_https_verification_off - cidd_set_dns_resolving - cidd_update_packages_catalog - cidd_install_packages_tools - cidd_install_ca_certificates - cidd_write_ca_certificates - cidd_update_ca_certificates - cidd_set_https_verification_on - cidd_update_packages_catalog - cidd_upgrade_packages - cidd_install_git - cidd_install_python + pidd_list_working_directory + pidd_set_https_verification_off + pidd_set_dns_resolving + pidd_update_packages_catalog + pidd_install_packages_tools + pidd_install_ca_certificates + pidd_write_ca_certificates + pidd_update_ca_certificates + pidd_set_https_verification_on + pidd_update_packages_catalog + pidd_upgrade_packages + pidd_install_git + pidd_install_python # TODO move to Python - cidd_install_rsync + pidd_install_rsync # TODO move to Python - cidd_install_ssh - cidd_clean_packages_cache - cidd_install_python_modules - cidd_write_python_module - cidd_switch_to_python "${@}" + pidd_install_ssh + pidd_clean_packages_cache + pidd_install_python_modules + pidd_write_python_module + pidd_switch_to_python "${@}" } # steps -cidd_set_environment_variables () { - cidd_step "Set environment variables" +pidd_set_environment_variables () { + pidd_step "Set environment variables" # set path - CIDD_PATH="$(realpath "${0}")" - cidd_echo "CIDD_PATH" + PIDD_PATH="$(realpath "${0}")" + pidd_echo "PIDD_PATH" # set operating system id - CIDD_OS_ID="$(cidd_grep_os ID)" - case "${CIDD_OS_ID}" in - "almalinux") CIDD_OS_ID="${CIDD_OS_ALMA}" ;; - "alpine") CIDD_OS_ID="${CIDD_OS_ALPINE}" ;; - "arch") CIDD_OS_ID="${CIDD_OS_ARCH}" ;; - "debian") CIDD_OS_ID="${CIDD_OS_DEBIAN}" ;; - "fedora") CIDD_OS_ID="${CIDD_OS_FEDORA}" ;; - "rocky") CIDD_OS_ID="${CIDD_OS_ROCKY}" ;; - "ubuntu") CIDD_OS_ID="${CIDD_OS_UBUNTU}" ;; - *) cidd_error_os "CIDD_OS_ID" ;; + PIDD_OS_ID="$(pidd_grep_os ID)" + case "${PIDD_OS_ID}" in + "almalinux") PIDD_OS_ID="${PIDD_OS_ALMA}" ;; + "alpine") PIDD_OS_ID="${PIDD_OS_ALPINE}" ;; + "arch") PIDD_OS_ID="${PIDD_OS_ARCH}" ;; + "debian") PIDD_OS_ID="${PIDD_OS_DEBIAN}" ;; + "fedora") PIDD_OS_ID="${PIDD_OS_FEDORA}" ;; + "rocky") PIDD_OS_ID="${PIDD_OS_ROCKY}" ;; + "ubuntu") PIDD_OS_ID="${PIDD_OS_UBUNTU}" ;; + *) pidd_error_os "PIDD_OS_ID" ;; esac # set operating system version - case "${CIDD_OS_ID}" in - "${CIDD_OS_ALMA}"|"${CIDD_OS_ARCH}"|"${CIDD_OS_FEDORA}"|"${CIDD_OS_ROCKY}") - CIDD_OS_VERSION=$(cidd_grep_os VERSION_ID \ + case "${PIDD_OS_ID}" in + "${PIDD_OS_ALMA}"|"${PIDD_OS_ARCH}"|"${PIDD_OS_FEDORA}"|"${PIDD_OS_ROCKY}") + PIDD_OS_VERSION=$(pidd_grep_os VERSION_ID \ | sed "s|^\([0-9]\+\)\..*|\1|") ;; - "${CIDD_OS_ALPINE}") - CIDD_OS_VERSION=$(cidd_grep_os VERSION_ID \ + "${PIDD_OS_ALPINE}") + PIDD_OS_VERSION=$(pidd_grep_os VERSION_ID \ | sed "s|^\([0-9]\+\.[0-9]\+\)\..*|\1|") ;; - "${CIDD_OS_DEBIAN}"|"${CIDD_OS_UBUNTU}") - CIDD_OS_VERSION="$(cidd_grep_os VERSION_CODENAME)" + "${PIDD_OS_DEBIAN}"|"${PIDD_OS_UBUNTU}") + PIDD_OS_VERSION="$(pidd_grep_os VERSION_CODENAME)" ;; *) esac # check operating system version - case "${CIDD_OS_ID}" in - "${CIDD_OS_ALMA}"|"${CIDD_OS_ROCKY}") - case "${CIDD_OS_VERSION}" in + case "${PIDD_OS_ID}" in + "${PIDD_OS_ALMA}"|"${PIDD_OS_ROCKY}") + case "${PIDD_OS_VERSION}" in "8"|"9") ;; - *) cidd_error_os "CIDD_OS_VERSION" ;; + *) pidd_error_os "PIDD_OS_VERSION" ;; esac ;; - "${CIDD_OS_ALPINE}") - case "${CIDD_OS_VERSION}" in + "${PIDD_OS_ALPINE}") + case "${PIDD_OS_VERSION}" in "3.18"|"3.19") ;; - *) cidd_error_os "CIDD_OS_VERSION" ;; + *) pidd_error_os "PIDD_OS_VERSION" ;; esac ;; - "${CIDD_OS_ARCH}") - case "${CIDD_OS_VERSION}" in + "${PIDD_OS_ARCH}") + case "${PIDD_OS_VERSION}" in "20231112"|"20240101") ;; - *) cidd_error_os "CIDD_OS_VERSION" ;; + *) pidd_error_os "PIDD_OS_VERSION" ;; esac ;; - "${CIDD_OS_DEBIAN}") - case "${CIDD_OS_VERSION}" in + "${PIDD_OS_DEBIAN}") + case "${PIDD_OS_VERSION}" in "bookworm"|"bullseye") ;; - *) cidd_error_os "CIDD_OS_VERSION" ;; + *) pidd_error_os "PIDD_OS_VERSION" ;; esac ;; - "${CIDD_OS_FEDORA}") - case "${CIDD_OS_VERSION}" in + "${PIDD_OS_FEDORA}") + case "${PIDD_OS_VERSION}" in "39"|"40") ;; - *) cidd_error_os "CIDD_OS_VERSION" ;; + *) pidd_error_os "PIDD_OS_VERSION" ;; esac ;; - "${CIDD_OS_UBUNTU}") - case "${CIDD_OS_VERSION}" in + "${PIDD_OS_UBUNTU}") + case "${PIDD_OS_VERSION}" in "jammy"|"noble") ;; - *) cidd_error_os "CIDD_OS_VERSION" ;; + *) pidd_error_os "PIDD_OS_VERSION" ;; esac ;; *) esac - cidd_split - cidd_echo "CIDD_OS_ID" "CIDD_OS_VERSION" + pidd_split + pidd_echo "PIDD_OS_ID" "PIDD_OS_VERSION" # universal - CIDD_DNS_FILE="/etc/resolv.conf" - CIDD_PKG_CA="ca-certificates" - CIDD_PKG_GIT="git" + PIDD_DNS_FILE="/etc/resolv.conf" + PIDD_PKG_CA="ca-certificates" + PIDD_PKG_GIT="git" # TODO move to Python - CIDD_PKG_RSYNC="rsync" - CIDD_PYTHON_ALIAS="python3" - cidd_split - cidd_echo "CIDD_DNS_FILE" "CIDD_PKG_CA" "CIDD_PKG_GIT" "CIDD_PYTHON_ALIAS" + PIDD_PKG_RSYNC="rsync" + PIDD_PYTHON_ALIAS="python3" + pidd_split + pidd_echo "PIDD_DNS_FILE" "PIDD_PKG_CA" "PIDD_PKG_GIT" "PIDD_PYTHON_ALIAS" # set ca command & root - case "${CIDD_OS_ID}" in - "${CIDD_OS_ALMA}"|"${CIDD_OS_FEDORA}"|"${CIDD_OS_ROCKY}") - CIDD_CA_ROOT="/etc/pki/ca-trust/source/anchors" - CIDD_CMD_CA="update-ca-trust" + case "${PIDD_OS_ID}" in + "${PIDD_OS_ALMA}"|"${PIDD_OS_FEDORA}"|"${PIDD_OS_ROCKY}") + PIDD_CA_ROOT="/etc/pki/ca-trust/source/anchors" + PIDD_CMD_CA="update-ca-trust" ;; - "${CIDD_OS_ALPINE}") - CIDD_CA_ROOT="/usr/local/share/ca-certificates" - CIDD_CMD_CA="update-ca-certificates" + "${PIDD_OS_ALPINE}") + PIDD_CA_ROOT="/usr/local/share/ca-certificates" + PIDD_CMD_CA="update-ca-certificates" ;; - "${CIDD_OS_ARCH}") - CIDD_CA_ROOT="/etc/ca-certificates/trust-source/anchors" - CIDD_CMD_CA="update-ca-trust" + "${PIDD_OS_ARCH}") + PIDD_CA_ROOT="/etc/ca-certificates/trust-source/anchors" + PIDD_CMD_CA="update-ca-trust" ;; - "${CIDD_OS_DEBIAN}"|"${CIDD_OS_UBUNTU}") - CIDD_CA_ROOT="/usr/local/share/ca-certificates" - CIDD_CMD_CA="update-ca-certificates" + "${PIDD_OS_DEBIAN}"|"${PIDD_OS_UBUNTU}") + PIDD_CA_ROOT="/usr/local/share/ca-certificates" + PIDD_CMD_CA="update-ca-certificates" ;; *) esac - cidd_split - cidd_echo "CIDD_CA_ROOT" "CIDD_CMD_CA" + pidd_split + pidd_echo "PIDD_CA_ROOT" "PIDD_CMD_CA" # set package manager - case "${CIDD_OS_ID}" in - "${CIDD_OS_ALPINE}") - CIDD_PM="${CIDD_PM_APK}" + case "${PIDD_OS_ID}" in + "${PIDD_OS_ALPINE}") + PIDD_PM="${PIDD_PM_APK}" ;; - "${CIDD_OS_DEBIAN}"|"${CIDD_OS_UBUNTU}") - CIDD_PM="${CIDD_PM_APT}" + "${PIDD_OS_DEBIAN}"|"${PIDD_OS_UBUNTU}") + PIDD_PM="${PIDD_PM_APT}" ;; - "${CIDD_OS_ALMA}"|"${CIDD_OS_FEDORA}"|"${CIDD_OS_ROCKY}") - CIDD_PM="${CIDD_PM_DNF}" + "${PIDD_OS_ALMA}"|"${PIDD_OS_FEDORA}"|"${PIDD_OS_ROCKY}") + PIDD_PM="${PIDD_PM_DNF}" ;; - "${CIDD_OS_ARCH}") - CIDD_PM="${CIDD_PM_PACMAN}" + "${PIDD_OS_ARCH}") + PIDD_PM="${PIDD_PM_PACMAN}" ;; *) esac - cidd_split - cidd_echo "CIDD_PM" - case "${CIDD_PM}" in - "${CIDD_PM_DNF}") - CIDD_PM_CLEAN="dnf clean all" - CIDD_PM_INSTALL="dnf install --assumeyes" - CIDD_PM_QUERY="rpm --query" - CIDD_PM_UPDATE="dnf makecache" - CIDD_PM_UPGRADE="dnf upgrade --assumeyes" - CIDD_PKG_PKG="" - CIDD_PM_CONF_PATH="/etc/dnf/dnf.conf" - CIDD_PM_CONF_TEXT="\ + pidd_split + pidd_echo "PIDD_PM" + case "${PIDD_PM}" in + "${PIDD_PM_DNF}") + PIDD_PM_CLEAN="dnf clean all" + PIDD_PM_INSTALL="dnf install --assumeyes" + PIDD_PM_QUERY="rpm --query" + PIDD_PM_UPDATE="dnf makecache" + PIDD_PM_UPGRADE="dnf upgrade --assumeyes" + PIDD_PKG_PKG="" + PIDD_PM_CONF_PATH="/etc/dnf/dnf.conf" + PIDD_PM_CONF_TEXT="\ [main] best=True clean_requirements_on_remove=True @@ -178,302 +178,302 @@ gpgcheck=1 installonly_limit=3 skip_if_unavailable=False " - CIDD_PM_HTTPS_PATH="/etc/dnf/dnf.conf.d/https.conf" - CIDD_PM_HTTPS_TEXT="\ + PIDD_PM_HTTPS_PATH="/etc/dnf/dnf.conf.d/https.conf" + PIDD_PM_HTTPS_TEXT="\ sslverify=False " ;; - "${CIDD_PM_APK}") - CIDD_PM_CLEAN="apk cache purge" - CIDD_PM_INSTALL="apk add" - CIDD_PM_QUERY="apk info" - CIDD_PM_UPDATE="apk update" - CIDD_PM_UPGRADE="apk upgrade" - CIDD_PKG_PKG="" - CIDD_PM_CONF_PATH="" - CIDD_PM_CONF_TEXT="" - CIDD_PM_HTTPS_PATH="/etc/apk/repositories.d/https" - CIDD_PM_HTTPS_TEXT="\ + "${PIDD_PM_APK}") + PIDD_PM_CLEAN="apk cache purge" + PIDD_PM_INSTALL="apk add" + PIDD_PM_QUERY="apk info" + PIDD_PM_UPDATE="apk update" + PIDD_PM_UPGRADE="apk upgrade" + PIDD_PKG_PKG="" + PIDD_PM_CONF_PATH="" + PIDD_PM_CONF_TEXT="" + PIDD_PM_HTTPS_PATH="/etc/apk/repositories.d/https" + PIDD_PM_HTTPS_TEXT="\ --no-verify " ;; - "${CIDD_PM_PACMAN}") - CIDD_PM_CLEAN="pacman --sync --clean --noconfirm" - CIDD_PM_INSTALL="pacman --sync --noconfirm" - CIDD_PM_QUERY="pacman --query" - CIDD_PM_UPDATE="pacman --sync --refresh" - CIDD_PM_UPGRADE="pacman --sync --sysupgrade --noconfirm" - CIDD_PKG_PKG="" - CIDD_PM_CONF_PATH="" - CIDD_PM_CONF_TEXT="" - CIDD_PM_HTTPS_PATH="/etc/pacman.d/https.conf" - CIDD_PM_HTTPS_TEXT="\ + "${PIDD_PM_PACMAN}") + PIDD_PM_CLEAN="pacman --sync --clean --noconfirm" + PIDD_PM_INSTALL="pacman --sync --noconfirm" + PIDD_PM_QUERY="pacman --query" + PIDD_PM_UPDATE="pacman --sync --refresh" + PIDD_PM_UPGRADE="pacman --sync --sysupgrade --noconfirm" + PIDD_PKG_PKG="" + PIDD_PM_CONF_PATH="" + PIDD_PM_CONF_TEXT="" + PIDD_PM_HTTPS_PATH="/etc/pacman.d/https.conf" + PIDD_PM_HTTPS_TEXT="\ SSLVerify = No " ;; - "${CIDD_PM_APT}") - CIDD_PM_CLEAN="apt-get clean" - CIDD_PM_INSTALL="apt-get install --assume-yes" - CIDD_PM_QUERY="dpkg-query --show" - CIDD_PM_UPDATE="apt-get update" - CIDD_PM_UPGRADE="apt-get upgrade --assume-yes" - CIDD_PKG_PKG="apt-utils" - CIDD_PM_CONF_PATH="/etc/apt/apt.conf.d/apt.conf" - CIDD_PM_CONF_TEXT="\ + "${PIDD_PM_APT}") + PIDD_PM_CLEAN="apt-get clean" + PIDD_PM_INSTALL="apt-get install --assume-yes" + PIDD_PM_QUERY="dpkg-query --show" + PIDD_PM_UPDATE="apt-get update" + PIDD_PM_UPGRADE="apt-get upgrade --assume-yes" + PIDD_PKG_PKG="apt-utils" + PIDD_PM_CONF_PATH="/etc/apt/apt.conf.d/apt.conf" + PIDD_PM_CONF_TEXT="\ Acquire::Check-Valid-Until True; APT::Get::Show-Versions True; APT::Install-Recommends False; APT::Install-Suggests False; Dir::Etc::SourceParts \"\"; " - CIDD_PM_HTTPS_PATH="/etc/apt/apt.conf.d/https" - CIDD_PM_HTTPS_TEXT="\ + PIDD_PM_HTTPS_PATH="/etc/apt/apt.conf.d/https" + PIDD_PM_HTTPS_TEXT="\ Acquire::https::Verify-Peer False; " ;; *) esac - cidd_split - cidd_echo "CIDD_PM_CLEAN" \ - "CIDD_PM_INSTALL" "CIDD_PM_QUERY" "CIDD_PM_UPDATE" "CIDD_PM_UPGRADE" - cidd_split - cidd_echo "CIDD_PKG_PKG" "CIDD_PM_CONF_PATH" "CIDD_PM_HTTPS_PATH" + pidd_split + pidd_echo "PIDD_PM_CLEAN" \ + "PIDD_PM_INSTALL" "PIDD_PM_QUERY" "PIDD_PM_UPDATE" "PIDD_PM_UPGRADE" + pidd_split + pidd_echo "PIDD_PKG_PKG" "PIDD_PM_CONF_PATH" "PIDD_PM_HTTPS_PATH" # specific - case "${CIDD_OS_ID}" in - "${CIDD_OS_ALMA}") - CIDD_URL_DEFAULT="https://repo.almalinux.org/almalinux" + case "${PIDD_OS_ID}" in + "${PIDD_OS_ALMA}") + PIDD_URL_DEFAULT="https://repo.almalinux.org/almalinux" ;; - "${CIDD_OS_ALPINE}") - CIDD_URL_DEFAULT="https://dl-cdn.alpinelinux.org/alpine" + "${PIDD_OS_ALPINE}") + PIDD_URL_DEFAULT="https://dl-cdn.alpinelinux.org/alpine" ;; - "${CIDD_OS_ARCH}") - CIDD_URL_DEFAULT="https://geo.mirror.pkgbuild.com" + "${PIDD_OS_ARCH}") + PIDD_URL_DEFAULT="https://geo.mirror.pkgbuild.com" ;; - "${CIDD_OS_DEBIAN}") - CIDD_URL_DEFAULT="http://deb.debian.org/debian" + "${PIDD_OS_DEBIAN}") + PIDD_URL_DEFAULT="http://deb.debian.org/debian" ;; - "${CIDD_OS_FEDORA}") - CIDD_URL_DEFAULT="http://download.example/pub/fedora/linux/releases" + "${PIDD_OS_FEDORA}") + PIDD_URL_DEFAULT="http://download.example/pub/fedora/linux/releases" ;; - "${CIDD_OS_ROCKY}") - CIDD_URL_DEFAULT="http://dl.rockylinux.org/\$contentdir" + "${PIDD_OS_ROCKY}") + PIDD_URL_DEFAULT="http://dl.rockylinux.org/\$contentdir" ;; - "${CIDD_OS_UBUNTU}") - CIDD_URL_DEFAULT="http://archive.ubuntu.com/ubuntu" + "${PIDD_OS_UBUNTU}") + PIDD_URL_DEFAULT="http://archive.ubuntu.com/ubuntu" ;; *) esac - CIDD_URL_CHOSEN="${CIDD_URL_DEFAULT}" - case "${CIDD_OS_ID}" in - "${CIDD_OS_ALMA}") - [ -n "${CIDD_URL_ALMA}" ] && CIDD_URL_CHOSEN="${CIDD_URL_ALMA}" + PIDD_URL_CHOSEN="${PIDD_URL_DEFAULT}" + case "${PIDD_OS_ID}" in + "${PIDD_OS_ALMA}") + [ -n "${PIDD_URL_ALMA}" ] && PIDD_URL_CHOSEN="${PIDD_URL_ALMA}" ;; - "${CIDD_OS_ALPINE}") - [ -n "${CIDD_URL_ALPINE}" ] && CIDD_URL_CHOSEN="${CIDD_URL_ALPINE}" + "${PIDD_OS_ALPINE}") + [ -n "${PIDD_URL_ALPINE}" ] && PIDD_URL_CHOSEN="${PIDD_URL_ALPINE}" ;; - "${CIDD_OS_ARCH}") - [ -n "${CIDD_URL_ARCH}" ] && CIDD_URL_CHOSEN="${CIDD_URL_ARCH}" + "${PIDD_OS_ARCH}") + [ -n "${PIDD_URL_ARCH}" ] && PIDD_URL_CHOSEN="${PIDD_URL_ARCH}" ;; - "${CIDD_OS_DEBIAN}") - [ -n "${CIDD_URL_DEBIAN}" ] && CIDD_URL_CHOSEN="${CIDD_URL_DEBIAN}" \ - || CIDD_URL_CHOSEN="https://deb.debian.org/debian" + "${PIDD_OS_DEBIAN}") + [ -n "${PIDD_URL_DEBIAN}" ] && PIDD_URL_CHOSEN="${PIDD_URL_DEBIAN}" \ + || PIDD_URL_CHOSEN="https://deb.debian.org/debian" ;; - "${CIDD_OS_FEDORA}") - [ -n "${CIDD_URL_FEDORA}" ] && CIDD_URL_CHOSEN="${CIDD_URL_FEDORA}" \ - || CIDD_URL_CHOSEN="https://rpmfind.net/linux/fedora/linux/releases" + "${PIDD_OS_FEDORA}") + [ -n "${PIDD_URL_FEDORA}" ] && PIDD_URL_CHOSEN="${PIDD_URL_FEDORA}" \ + || PIDD_URL_CHOSEN="https://rpmfind.net/linux/fedora/linux/releases" ;; - "${CIDD_OS_ROCKY}") - [ -n "${CIDD_URL_ROCKY}" ] && CIDD_URL_CHOSEN="${CIDD_URL_ROCKY}" \ - || CIDD_URL_CHOSEN="https://dl.rockylinux.org/\$contentdir" + "${PIDD_OS_ROCKY}") + [ -n "${PIDD_URL_ROCKY}" ] && PIDD_URL_CHOSEN="${PIDD_URL_ROCKY}" \ + || PIDD_URL_CHOSEN="https://dl.rockylinux.org/\$contentdir" ;; - "${CIDD_OS_UBUNTU}") - [ -n "${CIDD_URL_UBUNTU}" ] && CIDD_URL_CHOSEN="${CIDD_URL_UBUNTU}" \ - || CIDD_URL_CHOSEN="https://ubuntu.mirrors.ovh.net/ubuntu" + "${PIDD_OS_UBUNTU}") + [ -n "${PIDD_URL_UBUNTU}" ] && PIDD_URL_CHOSEN="${PIDD_URL_UBUNTU}" \ + || PIDD_URL_CHOSEN="https://ubuntu.mirrors.ovh.net/ubuntu" ;; *) esac - cidd_split - cidd_echo "CIDD_URL_DEFAULT" "CIDD_URL_CHOSEN" + pidd_split + pidd_echo "PIDD_URL_DEFAULT" "PIDD_URL_CHOSEN" # set python command & package - case "${CIDD_OS_ID}" in - "${CIDD_OS_ALMA}"|"${CIDD_OS_ROCKY}") - CIDD_PYTHON_COMMAND="python3.11" - CIDD_PYTHON_PACKAGE="python3.11" + case "${PIDD_OS_ID}" in + "${PIDD_OS_ALMA}"|"${PIDD_OS_ROCKY}") + PIDD_PYTHON_COMMAND="python3.11" + PIDD_PYTHON_PACKAGE="python3.11" ;; - "${CIDD_OS_ALPINE}") - CIDD_PYTHON_COMMAND="python3.11" - CIDD_PYTHON_PACKAGE="python3" + "${PIDD_OS_ALPINE}") + PIDD_PYTHON_COMMAND="python3.11" + PIDD_PYTHON_PACKAGE="python3" ;; - "${CIDD_OS_ARCH}") - CIDD_PYTHON_COMMAND="python3.12" - CIDD_PYTHON_PACKAGE="python" + "${PIDD_OS_ARCH}") + PIDD_PYTHON_COMMAND="python3.12" + PIDD_PYTHON_PACKAGE="python" ;; - "${CIDD_OS_DEBIAN}") - case "${CIDD_OS_VERSION}" in - "bookworm") CIDD_PYTHON_COMMAND="python3.11" ;; - "bullseye") CIDD_PYTHON_COMMAND="python3.9" ;; + "${PIDD_OS_DEBIAN}") + case "${PIDD_OS_VERSION}" in + "bookworm") PIDD_PYTHON_COMMAND="python3.11" ;; + "bullseye") PIDD_PYTHON_COMMAND="python3.9" ;; *) esac - CIDD_PYTHON_PACKAGE="python3" + PIDD_PYTHON_PACKAGE="python3" ;; - "${CIDD_OS_FEDORA}") - CIDD_PYTHON_COMMAND="python3.12" - CIDD_PYTHON_PACKAGE="python3" + "${PIDD_OS_FEDORA}") + PIDD_PYTHON_COMMAND="python3.12" + PIDD_PYTHON_PACKAGE="python3" ;; - "${CIDD_OS_UBUNTU}") - case "${CIDD_OS_VERSION}" in - "noble") CIDD_PYTHON_COMMAND="python3.12" ;; - "jammy") CIDD_PYTHON_COMMAND="python3.10" ;; + "${PIDD_OS_UBUNTU}") + case "${PIDD_OS_VERSION}" in + "noble") PIDD_PYTHON_COMMAND="python3.12" ;; + "jammy") PIDD_PYTHON_COMMAND="python3.10" ;; *) esac - CIDD_PYTHON_PACKAGE="python3" + PIDD_PYTHON_PACKAGE="python3" ;; *) esac # set python packages - case "${CIDD_OS_ID}" in - "${CIDD_OS_ALMA}"|"${CIDD_OS_FEDORA}"|"${CIDD_OS_ROCKY}") - CIDD_PYTHON_PACKAGES="/usr/lib64/${CIDD_PYTHON_COMMAND}/site-packages" + case "${PIDD_OS_ID}" in + "${PIDD_OS_ALMA}"|"${PIDD_OS_FEDORA}"|"${PIDD_OS_ROCKY}") + PIDD_PYTHON_PACKAGES="/usr/lib64/${PIDD_PYTHON_COMMAND}/site-packages" ;; - "${CIDD_OS_ALPINE}"|"${CIDD_OS_ARCH}") - CIDD_PYTHON_PACKAGES="/usr/lib/${CIDD_PYTHON_COMMAND}/site-packages" + "${PIDD_OS_ALPINE}"|"${PIDD_OS_ARCH}") + PIDD_PYTHON_PACKAGES="/usr/lib/${PIDD_PYTHON_COMMAND}/site-packages" ;; - "${CIDD_OS_DEBIAN}"|"${CIDD_OS_UBUNTU}") - CIDD_PYTHON_PACKAGES="/usr/lib/${CIDD_PYTHON_ALIAS}/dist-packages" + "${PIDD_OS_DEBIAN}"|"${PIDD_OS_UBUNTU}") + PIDD_PYTHON_PACKAGES="/usr/lib/${PIDD_PYTHON_ALIAS}/dist-packages" ;; *) esac - cidd_split - cidd_echo "CIDD_PYTHON_COMMAND" "CIDD_PYTHON_PACKAGE" "CIDD_PYTHON_PACKAGES" + pidd_split + pidd_echo "PIDD_PYTHON_COMMAND" "PIDD_PYTHON_PACKAGE" "PIDD_PYTHON_PACKAGES" # variables - [ -n "${CIDD_CA_1}" ] && CIDD_CA=true + [ -n "${PIDD_CA_1}" ] && PIDD_CA=true # continuous integration platform if [ -n "${GITHUB_ACTIONS}" ] ; then # github → gitea → forgejo if [ -n "${GITHUB_SERVER_URL}" ] ; then - CIDD_SERVER_URL="${GITHUB_SERVER_URL}" + PIDD_SERVER_URL="${GITHUB_SERVER_URL}" else - cidd_error_ci "GITHUB_SERVER_URL" + pidd_error_ci "GITHUB_SERVER_URL" fi if [ -n "${GITHUB_REPOSITORY}" ] ; then - CIDD_PROJECTS_GROUP="$(dirname "${GITHUB_REPOSITORY}")" - CIDD_PROJECT_NAME="$(basename "${GITHUB_REPOSITORY}")" + PIDD_PROJECTS_GROUP="$(dirname "${GITHUB_REPOSITORY}")" + PIDD_PROJECT_NAME="$(basename "${GITHUB_REPOSITORY}")" else - cidd_error_ci "GITHUB_REPOSITORY" + pidd_error_ci "GITHUB_REPOSITORY" fi if [ -n "${GITHUB_REF_NAME}" ] ; then - CIDD_PROJECT_BRANCH="${GITHUB_REF_NAME}" + PIDD_PROJECT_BRANCH="${GITHUB_REF_NAME}" else - cidd_error_ci "GITHUB_REF_NAME" + pidd_error_ci "GITHUB_REF_NAME" fi elif [ -n "${GITLAB_CI}" ] ; then # gitlab if [ -n "${CI_SERVER_URL}" ] ; then - CIDD_SERVER_URL="${CI_SERVER_URL}" + PIDD_SERVER_URL="${CI_SERVER_URL}" else - cidd_error_ci "CI_SERVER_URL" + pidd_error_ci "CI_SERVER_URL" fi if [ -n "${CI_PROJECT_PATH}" ] ; then - CIDD_PROJECTS_GROUP="$(dirname "${CI_PROJECT_PATH}")" - CIDD_PROJECT_NAME="$(basename "${CI_PROJECT_PATH}")" + PIDD_PROJECTS_GROUP="$(dirname "${CI_PROJECT_PATH}")" + PIDD_PROJECT_NAME="$(basename "${CI_PROJECT_PATH}")" else - cidd_error_ci "CI_PROJECT_PATH" + pidd_error_ci "CI_PROJECT_PATH" fi if [ -n "${CI_COMMIT_BRANCH}" ] ; then - CIDD_PROJECT_BRANCH="${CI_COMMIT_BRANCH}" + PIDD_PROJECT_BRANCH="${CI_COMMIT_BRANCH}" else - cidd_error_ci "CI_COMMIT_BRANCH" + pidd_error_ci "CI_COMMIT_BRANCH" fi else # unsupported - cidd_error_ci "ø" + pidd_error_ci "ø" fi - [ -n "${CIDD_SERVER_URL}" ] || cidd_error_ci "CIDD_SERVER_URL" - [ -n "${CIDD_PROJECTS_GROUP}" ] || cidd_error_ci "CIDD_PROJECTS_GROUP" - [ -n "${CIDD_PROJECT_NAME}" ] || cidd_error_ci "CIDD_PROJECT_NAME" - [ -n "${CIDD_PROJECT_BRANCH}" ] || cidd_error_ci "CIDD_PROJECT_BRANCH" + [ -n "${PIDD_SERVER_URL}" ] || pidd_error_ci "PIDD_SERVER_URL" + [ -n "${PIDD_PROJECTS_GROUP}" ] || pidd_error_ci "PIDD_PROJECTS_GROUP" + [ -n "${PIDD_PROJECT_NAME}" ] || pidd_error_ci "PIDD_PROJECT_NAME" + [ -n "${PIDD_PROJECT_BRANCH}" ] || pidd_error_ci "PIDD_PROJECT_BRANCH" # - CIDD_PROJECTS_URL="${CIDD_SERVER_URL}/${CIDD_PROJECTS_GROUP}" + PIDD_PROJECTS_URL="${PIDD_SERVER_URL}/${PIDD_PROJECTS_GROUP}" # - cidd_split - cidd_echo "CIDD_CA" - cidd_split - cidd_echo "CIDD_SERVER_URL" \ - "CIDD_PROJECTS_GROUP" "CIDD_PROJECT_NAME" "CIDD_PROJECT_BRANCH" - cidd_split - cidd_echo "CIDD_PROJECTS_URL" + pidd_split + pidd_echo "PIDD_CA" + pidd_split + pidd_echo "PIDD_SERVER_URL" \ + "PIDD_PROJECTS_GROUP" "PIDD_PROJECT_NAME" "PIDD_PROJECT_BRANCH" + pidd_split + pidd_echo "PIDD_PROJECTS_URL" # TODO move to Python - case "${CIDD_PM}" in - "${CIDD_PM_APK}"|"${CIDD_PM_APT}") CIDD_PKG_SSH="openssh-client" ;; - "${CIDD_PM_DNF}") CIDD_PKG_SSH="openssh-clients" ;; - "${CIDD_PM_PACMAN}") CIDD_PKG_SSH="openssh" ;; + case "${PIDD_PM}" in + "${PIDD_PM_APK}"|"${PIDD_PM_APT}") PIDD_PKG_SSH="openssh-client" ;; + "${PIDD_PM_DNF}") PIDD_PKG_SSH="openssh-clients" ;; + "${PIDD_PM_PACMAN}") PIDD_PKG_SSH="openssh" ;; *) esac } -cidd_set_packages_repositories () { - cidd_step "Set packages repositories" - case "${CIDD_OS_ID}" in - "${CIDD_OS_ALMA}") - case "${CIDD_OS_VERSION}" in +pidd_set_packages_repositories () { + pidd_step "Set packages repositories" + case "${PIDD_OS_ID}" in + "${PIDD_OS_ALMA}") + case "${PIDD_OS_VERSION}" in "8") \ -cidd_set_packages_repositories__file="/etc/yum.repos.d/almalinux.repo" ;; +pidd_set_packages_repositories__file="/etc/yum.repos.d/almalinux.repo" ;; "9") \ -cidd_set_packages_repositories__file="/etc/yum.repos.d/almalinux-baseos.repo" ;; +pidd_set_packages_repositories__file="/etc/yum.repos.d/almalinux-baseos.repo" ;; *) esac - cidd_sed "${cidd_set_packages_repositories__file}" \ + pidd_sed "${pidd_set_packages_repositories__file}" \ "|^mirrorlist|# mirrorlist|" \ - "|${CIDD_URL_DEFAULT}|${CIDD_URL_CHOSEN}|" \ + "|${PIDD_URL_DEFAULT}|${PIDD_URL_CHOSEN}|" \ "|^# baseurl|baseurl|" ;; - "${CIDD_OS_ALPINE}") - cidd_set_packages_repositories__file="/etc/apk/repositories" - cidd_write "${cidd_set_packages_repositories__file}" "\ -${CIDD_URL_CHOSEN}/v${CIDD_OS_VERSION}/main -${CIDD_URL_CHOSEN}/v${CIDD_OS_VERSION}/community + "${PIDD_OS_ALPINE}") + pidd_set_packages_repositories__file="/etc/apk/repositories" + pidd_write "${pidd_set_packages_repositories__file}" "\ +${PIDD_URL_CHOSEN}/v${PIDD_OS_VERSION}/main +${PIDD_URL_CHOSEN}/v${PIDD_OS_VERSION}/community " ;; - "${CIDD_OS_DEBIAN}") - cidd_set_packages_repositories__file="/etc/apt/sources.list" - cidd_write "${cidd_set_packages_repositories__file}" "\ -deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION} main -deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION}-backports main -deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION}-updates main -deb ${CIDD_URL_CHOSEN}-security ${CIDD_OS_VERSION}-security main + "${PIDD_OS_DEBIAN}") + pidd_set_packages_repositories__file="/etc/apt/sources.list" + pidd_write "${pidd_set_packages_repositories__file}" "\ +deb ${PIDD_URL_CHOSEN} ${PIDD_OS_VERSION} main +deb ${PIDD_URL_CHOSEN} ${PIDD_OS_VERSION}-backports main +deb ${PIDD_URL_CHOSEN} ${PIDD_OS_VERSION}-updates main +deb ${PIDD_URL_CHOSEN}-security ${PIDD_OS_VERSION}-security main " ;; - "${CIDD_OS_ROCKY}") - case "${CIDD_OS_VERSION}" in + "${PIDD_OS_ROCKY}") + case "${PIDD_OS_VERSION}" in "8") \ -cidd_set_packages_repositories__file="/etc/yum.repos.d/Rocky-BaseOS.repo" ;; +pidd_set_packages_repositories__file="/etc/yum.repos.d/Rocky-BaseOS.repo" ;; "9") \ -cidd_set_packages_repositories__file="/etc/yum.repos.d/rocky.repo" ;; +pidd_set_packages_repositories__file="/etc/yum.repos.d/rocky.repo" ;; *) esac - cidd_sed "${cidd_set_packages_repositories__file}" \ + pidd_sed "${pidd_set_packages_repositories__file}" \ "|^mirrorlist|# mirrorlist|" \ - "|${CIDD_URL_DEFAULT}|${CIDD_URL_CHOSEN}|" \ + "|${PIDD_URL_DEFAULT}|${PIDD_URL_CHOSEN}|" \ "|^#baseurl|baseurl|" ;; - "${CIDD_OS_UBUNTU}") - cidd_set_packages_repositories__file="/etc/apt/sources.list" - cidd_write "${cidd_set_packages_repositories__file}" "\ -deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION} main -deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION}-backports main -deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION}-updates main -deb ${CIDD_URL_CHOSEN} ${CIDD_OS_VERSION}-security main + "${PIDD_OS_UBUNTU}") + pidd_set_packages_repositories__file="/etc/apt/sources.list" + pidd_write "${pidd_set_packages_repositories__file}" "\ +deb ${PIDD_URL_CHOSEN} ${PIDD_OS_VERSION} main +deb ${PIDD_URL_CHOSEN} ${PIDD_OS_VERSION}-backports main +deb ${PIDD_URL_CHOSEN} ${PIDD_OS_VERSION}-updates main +deb ${PIDD_URL_CHOSEN} ${PIDD_OS_VERSION}-security main " ;; *) esac } -cidd_set_packages_configuration () { - cidd_step "Set packages configuration" - cidd_write "${CIDD_PM_CONF_PATH}" "${CIDD_PM_CONF_TEXT}" - case "${CIDD_OS_ID}" in - "${CIDD_OS_DEBIAN}"|"${CIDD_OS_UBUNTU}") +pidd_set_packages_configuration () { + pidd_step "Set packages configuration" + pidd_write "${PIDD_PM_CONF_PATH}" "${PIDD_PM_CONF_TEXT}" + case "${PIDD_OS_ID}" in + "${PIDD_OS_DEBIAN}"|"${PIDD_OS_UBUNTU}") export DEBIAN_FRONTEND="noninteractive" ;; *) @@ -482,336 +482,336 @@ cidd_set_packages_configuration () { # agnostic steps -cidd_list_working_directory () { - cidd_step "List working directory" - cidd_list_working_directory__path="$(realpath .)" - cidd_ls "${cidd_list_working_directory__path}" +pidd_list_working_directory () { + pidd_step "List working directory" + pidd_list_working_directory__path="$(realpath .)" + pidd_ls "${pidd_list_working_directory__path}" } -cidd_set_https_verification_off () { - if [ -n "${CIDD_CA}" ] || [ "${CIDD_PM}" = "${CIDD_PM_APT}" ] ; then - cidd_step "Set HTTPS verification off" - cidd_mkdir "$(dirname "${CIDD_PM_HTTPS_PATH}")" - cidd_write "${CIDD_PM_HTTPS_PATH}" "${CIDD_PM_HTTPS_TEXT}" +pidd_set_https_verification_off () { + if [ -n "${PIDD_CA}" ] || [ "${PIDD_PM}" = "${PIDD_PM_APT}" ] ; then + pidd_step "Set HTTPS verification off" + pidd_mkdir "$(dirname "${PIDD_PM_HTTPS_PATH}")" + pidd_write "${PIDD_PM_HTTPS_PATH}" "${PIDD_PM_HTTPS_TEXT}" fi } -cidd_set_dns_resolving () { - cidd_step "Set DNS resolving" - for cidd_set_dns_resolving__server in ${CIDD_DNS} ; do - cidd_set_dns_resolving__text="${cidd_set_dns_resolving__text}\ -nameserver ${cidd_set_dns_resolving__server} +pidd_set_dns_resolving () { + pidd_step "Set DNS resolving" + for pidd_set_dns_resolving__server in ${PIDD_DNS} ; do + pidd_set_dns_resolving__text="${pidd_set_dns_resolving__text}\ +nameserver ${pidd_set_dns_resolving__server} " done - cidd_write "${CIDD_DNS_FILE}" "${cidd_set_dns_resolving__text}" + pidd_write "${PIDD_DNS_FILE}" "${pidd_set_dns_resolving__text}" } -cidd_update_packages_catalog () { - cidd_step "Update packages catalog" - ${CIDD_PM_UPDATE} || exit +pidd_update_packages_catalog () { + pidd_step "Update packages catalog" + ${PIDD_PM_UPDATE} || exit } -cidd_install_packages_tools () { - cidd_step "Install packages tools" - cidd_install_package "${CIDD_PKG_PKG}" +pidd_install_packages_tools () { + pidd_step "Install packages tools" + pidd_install_package "${PIDD_PKG_PKG}" } -cidd_install_ca_certificates () { - cidd_step "Install CA" - cidd_install_package "${CIDD_PKG_CA}" +pidd_install_ca_certificates () { + pidd_step "Install CA" + pidd_install_package "${PIDD_PKG_CA}" } -cidd_write_ca_certificates () { - cidd_step "Write CA certificates" - cidd_mkdir "${CIDD_CA_ROOT}" - cidd_write_ca_certificates__index=1 - eval "cidd_write_ca_certificates__text=\ -\"\${CIDD_CA_${cidd_write_ca_certificates__index}}\"" - while [ -n "${cidd_write_ca_certificates__text}" ] ; do - cidd_write_ca_certificates__path="\ -${CIDD_CA_ROOT}/${cidd_write_ca_certificates__index}.crt" - cidd_split - cidd_write \ - "${cidd_write_ca_certificates__path}" \ - "${cidd_write_ca_certificates__text}" - cidd_openssl "${cidd_write_ca_certificates__path}" - cidd_write_ca_certificates__index=$((cidd_write_ca_certificates__index+1)) - eval "cidd_write_ca_certificates__text=\ -\"\${CIDD_CA_${cidd_write_ca_certificates__index}}\"" +pidd_write_ca_certificates () { + pidd_step "Write CA certificates" + pidd_mkdir "${PIDD_CA_ROOT}" + pidd_write_ca_certificates__index=1 + eval "pidd_write_ca_certificates__text=\ +\"\${PIDD_CA_${pidd_write_ca_certificates__index}}\"" + while [ -n "${pidd_write_ca_certificates__text}" ] ; do + pidd_write_ca_certificates__path="\ +${PIDD_CA_ROOT}/${pidd_write_ca_certificates__index}.crt" + pidd_split + pidd_write \ + "${pidd_write_ca_certificates__path}" \ + "${pidd_write_ca_certificates__text}" + pidd_openssl "${pidd_write_ca_certificates__path}" + pidd_write_ca_certificates__index=$((pidd_write_ca_certificates__index+1)) + eval "pidd_write_ca_certificates__text=\ +\"\${PIDD_CA_${pidd_write_ca_certificates__index}}\"" done } -cidd_update_ca_certificates () { - cidd_step "Update CA certificates" - ${CIDD_CMD_CA} || exit +pidd_update_ca_certificates () { + pidd_step "Update CA certificates" + ${PIDD_CMD_CA} || exit } -cidd_set_https_verification_on () { - cidd_step "Set HTTPS verification on" - cidd_rm "${CIDD_PM_HTTPS_PATH}" +pidd_set_https_verification_on () { + pidd_step "Set HTTPS verification on" + pidd_rm "${PIDD_PM_HTTPS_PATH}" } -cidd_upgrade_packages () { - cidd_step "Upgrade packages" - ${CIDD_PM_UPGRADE} || exit +pidd_upgrade_packages () { + pidd_step "Upgrade packages" + ${PIDD_PM_UPGRADE} || exit } -cidd_install_git () { - cidd_step "Install Git" - cidd_install_package "${CIDD_PKG_GIT}" +pidd_install_git () { + pidd_step "Install Git" + pidd_install_package "${PIDD_PKG_GIT}" } -cidd_install_python () { - cidd_step "Install Python" - cidd_install_package "${CIDD_PYTHON_PACKAGE}" - cidd_split - cidd_ln_python "${CIDD_PYTHON_COMMAND}" +pidd_install_python () { + pidd_step "Install Python" + pidd_install_package "${PIDD_PYTHON_PACKAGE}" + pidd_split + pidd_ln_python "${PIDD_PYTHON_COMMAND}" } # TODO move to Python -cidd_install_rsync () { - cidd_step "Install Rsync" - cidd_install_package "${CIDD_PKG_RSYNC}" +pidd_install_rsync () { + pidd_step "Install Rsync" + pidd_install_package "${PIDD_PKG_RSYNC}" } # TODO move to Python -cidd_install_ssh () { - cidd_step "Install SSH" - cidd_install_package "${CIDD_PKG_SSH}" +pidd_install_ssh () { + pidd_step "Install SSH" + pidd_install_package "${PIDD_PKG_SSH}" } -cidd_clean_packages_cache () { - cidd_step "Clean packages cache" - ${CIDD_PM_CLEAN} || exit +pidd_clean_packages_cache () { + pidd_step "Clean packages cache" + ${PIDD_PM_CLEAN} || exit } -cidd_install_python_modules () { - cidd_step "Install Python modules" - cidd_install_python_modules__root="$(mktemp --directory)" || exit - echo "→ ${cidd_install_python_modules__root}" - for cidd_install_python_modules__repository \ - in "${CIDD_GIT_CHILD}" "${CIDD_GIT_PARENT}" ; do - cidd_split - cidd_install_python_modules__url="\ -${CIDD_PROJECTS_URL}/${cidd_install_python_modules__repository}" +pidd_install_python_modules () { + pidd_step "Install Python modules" + pidd_install_python_modules__root="$(mktemp --directory)" || exit + echo "→ ${pidd_install_python_modules__root}" + for pidd_install_python_modules__repository \ + in "${PIDD_GIT_CHILD}" "${PIDD_GIT_PARENT}" ; do + pidd_split + pidd_install_python_modules__url="\ +${PIDD_PROJECTS_URL}/${pidd_install_python_modules__repository}" echo "\ -${cidd_install_python_modules__url} +${pidd_install_python_modules__url} ↓" git clone \ - "${cidd_install_python_modules__url}" \ - "${cidd_install_python_modules__root}\ -/${cidd_install_python_modules__repository}" \ + "${pidd_install_python_modules__url}" \ + "${pidd_install_python_modules__root}\ +/${pidd_install_python_modules__repository}" \ || exit - cidd_install_python_modules__path="\ -${cidd_install_python_modules__root}\ -/${cidd_install_python_modules__repository}\ -/${cidd_install_python_modules__repository}" + pidd_install_python_modules__path="\ +${pidd_install_python_modules__root}\ +/${pidd_install_python_modules__repository}\ +/${pidd_install_python_modules__repository}" echo "\ -${cidd_install_python_modules__path} +${pidd_install_python_modules__path} ↓ -${CIDD_PYTHON_PACKAGES}" +${PIDD_PYTHON_PACKAGES}" cp --recursive \ - "${cidd_install_python_modules__path}" "${CIDD_PYTHON_PACKAGES}" \ + "${pidd_install_python_modules__path}" "${PIDD_PYTHON_PACKAGES}" \ || exit done - cidd_split - cidd_ls "${CIDD_PYTHON_PACKAGES}" - cidd_split - cidd_rm "${cidd_install_python_modules__root}" + pidd_split + pidd_ls "${PIDD_PYTHON_PACKAGES}" + pidd_split + pidd_rm "${pidd_install_python_modules__root}" } -cidd_write_python_module () { - cidd_step "Write Python module" - for cidd_write_python_module__variable \ +pidd_write_python_module () { + pidd_step "Write Python module" + for pidd_write_python_module__variable \ in OPEN DOWN VERT SPLT __UP SHUT OS_ID OS_VERSION ; do - cidd_write_python_module__value="\ -$(cidd_echo "CIDD_${cidd_write_python_module__variable}")" - cidd_write_python_module__text="${cidd_write_python_module__text}\ -${cidd_write_python_module__value} + pidd_write_python_module__value="\ +$(pidd_echo "PIDD_${pidd_write_python_module__variable}")" + pidd_write_python_module__text="${pidd_write_python_module__text}\ +${pidd_write_python_module__value} " done - cidd_write "${CIDD_PYTHON_PACKAGES}/env.py" "${cidd_write_python_module__text}\ -CIDD_STEP = $((CIDD_STEP+1)) + pidd_write "${PIDD_PYTHON_PACKAGES}/env.py" "${pidd_write_python_module__text}\ +PIDD_STEP = $((PIDD_STEP+1)) " } -cidd_switch_to_python () { - cidd_step "Switch to Python" +pidd_switch_to_python () { + pidd_step "Switch to Python" echo "\ -${CIDD_PATH} +${PIDD_PATH} ↓ -${CIDD_PYTHON_PACKAGES}/${CIDD_GIT_CHILD}" - "${CIDD_PYTHON_ALIAS}" -m "${CIDD_GIT_CHILD}" "${@}" +${PIDD_PYTHON_PACKAGES}/${PIDD_GIT_CHILD}" + "${PIDD_PYTHON_ALIAS}" -m "${PIDD_GIT_CHILD}" "${@}" } # functions -cidd_cat () { - cidd_cat__file="${1}" - if [ -n "${cidd_cat__file}" ] ; then - cidd_open "${cidd_cat__file}" - cat "${cidd_cat__file}" || exit - cidd_shut "${cidd_cat__file}" +pidd_cat () { + pidd_cat__file="${1}" + if [ -n "${pidd_cat__file}" ] ; then + pidd_open "${pidd_cat__file}" + cat "${pidd_cat__file}" || exit + pidd_shut "${pidd_cat__file}" fi } -cidd_echo () { +pidd_echo () { if [ -n "${1}" ] ; then - for cidd_echo__name in "${@}" ; do - eval "cidd_echo__text=\"\${${cidd_echo__name}}\"" - echo "${cidd_echo__name} = \"${cidd_echo__text}\"" + for pidd_echo__name in "${@}" ; do + eval "pidd_echo__text=\"\${${pidd_echo__name}}\"" + echo "${pidd_echo__name} = \"${pidd_echo__text}\"" done fi } -cidd_error_ci () { +pidd_error_ci () { echo "× CI: ${*}" - exit "${CIDD_ERROR_CI}" + exit "${PIDD_ERROR_CI}" } -cidd_error_os () { - cidd_error_os__variable="${1}" +pidd_error_os () { + pidd_error_os__variable="${1}" printf "× OS: " - cidd_echo "${cidd_error_os__variable}" - exit "${CIDD_ERROR_OS}" + pidd_echo "${pidd_error_os__variable}" + exit "${PIDD_ERROR_OS}" } -cidd_grep_os () { - cidd_grep_os__variable="${1}" - if [ -n "${cidd_grep_os__variable}" ] ; then - grep "^${cidd_grep_os__variable}=" "/etc/os-release" \ - | sed "s|^${cidd_grep_os__variable}=||" \ +pidd_grep_os () { + pidd_grep_os__variable="${1}" + if [ -n "${pidd_grep_os__variable}" ] ; then + grep "^${pidd_grep_os__variable}=" "/etc/os-release" \ + | sed "s|^${pidd_grep_os__variable}=||" \ | sed "s|^\"\(.*\)\"$|\1|" fi } -cidd_install_package () { - cidd_install_package__name="${1}" - if [ -n "${cidd_install_package__name}" ] ; then - ${CIDD_PM_INSTALL} "${cidd_install_package__name}" || exit +pidd_install_package () { + pidd_install_package__name="${1}" + if [ -n "${pidd_install_package__name}" ] ; then + ${PIDD_PM_INSTALL} "${pidd_install_package__name}" || exit fi } -cidd_ln_python () { - cidd_ln_python__command="${1}" - if [ -n "${cidd_ln_python__command}" ] ; then - echo "→ ${CIDD_PYTHON_ALIAS} → ${cidd_ln_python__command}" - ln -f -s "${cidd_ln_python__command}" "/usr/bin/${CIDD_PYTHON_ALIAS}" \ +pidd_ln_python () { + pidd_ln_python__command="${1}" + if [ -n "${pidd_ln_python__command}" ] ; then + echo "→ ${PIDD_PYTHON_ALIAS} → ${pidd_ln_python__command}" + ln -f -s "${pidd_ln_python__command}" "/usr/bin/${PIDD_PYTHON_ALIAS}" \ || exit fi } -cidd_ls () { - cidd_ls__path="${1}" - if [ -n "${cidd_ls__path}" ] ; then - cidd_open "${cidd_ls__path}" - ls -a -l "${cidd_ls__path}" || exit - cidd_shut "${cidd_ls__path}" +pidd_ls () { + pidd_ls__path="${1}" + if [ -n "${pidd_ls__path}" ] ; then + pidd_open "${pidd_ls__path}" + ls -a -l "${pidd_ls__path}" || exit + pidd_shut "${pidd_ls__path}" fi } -cidd_mkdir () { - cidd_mkdir__path="${1}" - if [ -n "${cidd_mkdir__path}" ] ; then - echo "→ ${cidd_mkdir__path}" - mkdir --parents "${cidd_mkdir__path}" || exit +pidd_mkdir () { + pidd_mkdir__path="${1}" + if [ -n "${pidd_mkdir__path}" ] ; then + echo "→ ${pidd_mkdir__path}" + mkdir --parents "${pidd_mkdir__path}" || exit fi } -cidd_open () { - echo "${CIDD_OPEN}${*}" +pidd_open () { + echo "${PIDD_OPEN}${*}" } -cidd_openssl () { - cidd_openssl__file="${1}" - if [ -f "${cidd_openssl__file}" ] ; then +pidd_openssl () { + pidd_openssl__file="${1}" + if [ -f "${pidd_openssl__file}" ] ; then openssl x509 \ - -in "${cidd_openssl__file}" \ + -in "${pidd_openssl__file}" \ -noout -text \ || exit fi } -cidd_rm () { - cidd_rm__path="${1}" - if [ -e "${cidd_rm__path}" ] ; then - echo "← ${cidd_rm__path}" - rm -r "${cidd_rm__path}" || exit +pidd_rm () { + pidd_rm__path="${1}" + if [ -e "${pidd_rm__path}" ] ; then + echo "← ${pidd_rm__path}" + rm -r "${pidd_rm__path}" || exit fi } -cidd_sed () { - cidd_sed__file="${1}" +pidd_sed () { + pidd_sed__file="${1}" shift - if [ -f "${cidd_sed__file}" ] ; then - cidd_cat "${cidd_sed__file}" - for cidd_sed__regex in "${@}" ; do - sed --in-place "s${cidd_sed__regex}g" "${cidd_sed__file}" \ - && cidd_cat "${cidd_sed__file}" \ + if [ -f "${pidd_sed__file}" ] ; then + pidd_cat "${pidd_sed__file}" + for pidd_sed__regex in "${@}" ; do + sed --in-place "s${pidd_sed__regex}g" "${pidd_sed__file}" \ + && pidd_cat "${pidd_sed__file}" \ || exit done fi } -cidd_shut () { - echo "${CIDD_SHUT}${*}" +pidd_shut () { + echo "${PIDD_SHUT}${*}" } -cidd_split () { - echo "${CIDD_SPLT}" +pidd_split () { + echo "${PIDD_SPLT}" } -cidd_step () { - CIDD_STEP=$((CIDD_STEP+1)) +pidd_step () { + PIDD_STEP=$((PIDD_STEP+1)) echo "\ -${CIDD_DOWN} -${CIDD_VERT} ${CIDD_STEP} ${*} -${CIDD___UP}" +${PIDD_DOWN} +${PIDD_VERT} ${PIDD_STEP} ${*} +${PIDD___UP}" } -cidd_write () { - cidd_write__file="${1}" - cidd_write__text="${2}" - if [ -n "${cidd_write__file}" ] ; then - [ -f "${cidd_write__file}" ] && cidd_cat "${cidd_write__file}" - echo "→ ${cidd_write__file}" - printf "%s" "${cidd_write__text}" > "${cidd_write__file}" || exit - cidd_cat "${cidd_write__file}" +pidd_write () { + pidd_write__file="${1}" + pidd_write__text="${2}" + if [ -n "${pidd_write__file}" ] ; then + [ -f "${pidd_write__file}" ] && pidd_cat "${pidd_write__file}" + echo "→ ${pidd_write__file}" + printf "%s" "${pidd_write__text}" > "${pidd_write__file}" || exit + pidd_cat "${pidd_write__file}" fi } # constants -CIDD_BOX_DOWN="╭" -CIDD_BOX_LEFT="╴" -CIDD_BOX_RIGHT="╶" -CIDD_BOX_UP="╰" -CIDD_BOX_VERTICAL="│" +PIDD_BOX_DOWN="╭" +PIDD_BOX_LEFT="╴" +PIDD_BOX_RIGHT="╶" +PIDD_BOX_UP="╰" +PIDD_BOX_VERTICAL="│" -CIDD_ERROR_CI=2 -CIDD_ERROR_OS=1 +PIDD_ERROR_CI=2 +PIDD_ERROR_OS=1 -CIDD_OS_ALMA="alma" -CIDD_OS_ALPINE="alpine" -CIDD_OS_ARCH="arch" -CIDD_OS_DEBIAN="debian" -CIDD_OS_FEDORA="fedora" -CIDD_OS_ROCKY="rocky" -CIDD_OS_UBUNTU="ubuntu" +PIDD_OS_ALMA="alma" +PIDD_OS_ALPINE="alpine" +PIDD_OS_ARCH="arch" +PIDD_OS_DEBIAN="debian" +PIDD_OS_FEDORA="fedora" +PIDD_OS_ROCKY="rocky" +PIDD_OS_UBUNTU="ubuntu" -CIDD_PM_APK="apk" -CIDD_PM_APT="apt" -CIDD_PM_DNF="dnf" -CIDD_PM_PACMAN="pacman" +PIDD_PM_APK="apk" +PIDD_PM_APT="apt" +PIDD_PM_DNF="dnf" +PIDD_PM_PACMAN="pacman" -CIDD_HORIZONTAL="────╌╌╌╌┄┄┄┄┈┈┈┈" +PIDD_HORIZONTAL="────╌╌╌╌┄┄┄┄┈┈┈┈" -CIDD_OPEN="${CIDD_BOX_DOWN}${CIDD_BOX_LEFT}" -CIDD_DOWN="${CIDD_BOX_DOWN}${CIDD_HORIZONTAL}" -CIDD_VERT="${CIDD_BOX_VERTICAL}" -CIDD_SPLT="${CIDD_BOX_RIGHT}${CIDD_HORIZONTAL}" -CIDD___UP="${CIDD_BOX_UP}${CIDD_HORIZONTAL}" -CIDD_SHUT="${CIDD_BOX_UP}${CIDD_BOX_LEFT}" +PIDD_OPEN="${PIDD_BOX_DOWN}${PIDD_BOX_LEFT}" +PIDD_DOWN="${PIDD_BOX_DOWN}${PIDD_HORIZONTAL}" +PIDD_VERT="${PIDD_BOX_VERTICAL}" +PIDD_SPLT="${PIDD_BOX_RIGHT}${PIDD_HORIZONTAL}" +PIDD___UP="${PIDD_BOX_UP}${PIDD_HORIZONTAL}" +PIDD_SHUT="${PIDD_BOX_UP}${PIDD_BOX_LEFT}" # run -cidd_main "${@}" +pidd_main "${@}" diff --git a/pidd/__init__.py b/pidd/__init__.py index b735c80..7ddf07f 100644 --- a/pidd/__init__.py +++ b/pidd/__init__.py @@ -10,21 +10,21 @@ import env from rwx import fs, ps from rwx.log import stream as log -import cidd -from cidd.project import Project -from cidd.projects import Projects +import pidd +from pidd.project import Project +from pidd.projects import Projects -COMMANDS_PREFIX = "cidd-" +COMMANDS_PREFIX = "pidd-" projects = Projects() project = Project(projects) -def cidd_browse_workspace() -> None: +def pidd_browse_workspace() -> None: browse(project.root) -def cidd_build_project() -> None: +def pidd_build_project() -> None: for extension in ["py", "sh"]: path = Path(project.root) / f"build.{extension}" if path.exists(): @@ -34,7 +34,7 @@ def cidd_build_project() -> None: pass -def cidd_clone_branch() -> None: +def pidd_clone_branch() -> None: log.info(projects) split() log.info(project) @@ -58,12 +58,12 @@ def cidd_clone_branch() -> None: ) -def cidd_list_environment() -> None: +def pidd_list_environment() -> None: for variable, value in sorted(projects.environment.items()): log.info(f"{variable} = {value}") -def cidd_synchronize() -> None: +def pidd_synchronize() -> None: host = "rwx.work" source = "out" user = "cd" @@ -119,10 +119,10 @@ def main() -> None: path, *arguments = sys.argv name = Path(path).name if name == "__main__.py": - cidd.set_ssh(*arguments) - cidd.install_commands(__file__) + pidd.set_ssh(*arguments) + pidd.install_commands(__file__) else: - function = getattr(cidd, name.replace("-", "_")) + function = getattr(pidd, name.replace("-", "_")) function(*arguments) @@ -154,19 +154,19 @@ def set_ssh(*arguments: str) -> None: def frame(text: str) -> None: - log.info(f"{env.CIDD_OPEN}{text}") + log.info(f"{env.PIDD_OPEN}{text}") def shut(text: str) -> None: - log.info(f"{env.CIDD_SHUT}{text}") + log.info(f"{env.PIDD_SHUT}{text}") def split() -> None: - log.info(env.CIDD_SPLT) + log.info(env.PIDD_SPLT) def step(text: str) -> None: - env.CIDD_STEP += 1 - log.info(env.CIDD_DOWN) - log.info(f"{env.CIDD_VERT} {env.CIDD_STEP} {text}") - log.info(env.CIDD___UP) + env.PIDD_STEP += 1 + log.info(env.PIDD_DOWN) + log.info(f"{env.PIDD_VERT} {env.PIDD_STEP} {text}") + log.info(env.PIDD___UP) diff --git a/pidd/__main__.py b/pidd/__main__.py index 2d29cea..db32c33 100755 --- a/pidd/__main__.py +++ b/pidd/__main__.py @@ -2,7 +2,7 @@ """Entry point.""" -import cidd +import pidd if __name__ == "__main__": - cidd.main(__file__) + pidd.main(__file__) diff --git a/pidd/project.py b/pidd/project.py index 787c97c..2bff2d8 100644 --- a/pidd/project.py +++ b/pidd/project.py @@ -7,7 +7,7 @@ from typing import TYPE_CHECKING from urllib.parse import urljoin if TYPE_CHECKING: - from cidd.projects import Projects + from pidd.projects import Projects BRANCH = [ "GITHUB_REF_NAME", diff --git a/pyproject.toml b/pyproject.toml index 994bfc7..8b9edb0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ description = "Continuous Integration, Delivery & Deployment" dynamic = ["version"] keywords = [] license-files = { paths = ["license.md"] } -name = "cidd" +name = "pidd" readme = "readme.md" requires-python = ">= 3.10" @@ -29,7 +29,7 @@ requires-python = ">= 3.10" [project.urls] [tool.hatch.version] -path = "cidd/__init__.py" +path = "pidd/__init__.py" [tool.ruff] line-length = 80 diff --git a/readme.md b/readme.md index d4d6730..69fb1b5 100644 --- a/readme.md +++ b/readme.md @@ -41,19 +41,19 @@ from various contexts of CA, CI and OCI / OS. | Variable | Description | Default | |:----------------|:------------------------|:--------------------------------| -| CIDD_CA_n | Numbered CA certificate | | -| CIDD_DNS | Space separated servers | 9.9.9.9 | -| CIDD_GIT_CHILD | Child Git repository | cidd | -| CIDD_GIT_PARENT | Parent Git repository | rwx | -| CIDD_SSH_HOSTS | domain.tld ssh-type pub | | -| CIDD_SSH_KEY | SSH private key | | -| CIDD_URL_ALMA | Alma repository URL | https://repo.almalinux.org | -| CIDD_URL_ALPINE | Alpine repository URL | https://dl-cdn.alpinelinux.org | -| CIDD_URL_ARCH | Arch repository URL | https://geo.mirror.pkgbuild.com | -| CIDD_URL_DEBIAN | Debian repository URL | https://deb.debian.org | -| CIDD_URL_FEDORA | Fedora repository URL | https://rpmfind.net | -| CIDD_URL_ROCKY | Rocky repository URL | https://dl.rockylinux.org | -| CIDD_URL_UBUNTU | Ubuntu repository URL | https://ubuntu.mirrors.ovh.net | +| PIDD_CA_n | Numbered CA certificate | | +| PIDD_DNS | Space separated servers | 9.9.9.9 | +| PIDD_GIT_CHILD | Child Git repository | pidd | +| PIDD_GIT_PARENT | Parent Git repository | rwx | +| PIDD_SSH_HOSTS | domain.tld ssh-type pub | | +| PIDD_SSH_KEY | SSH private key | | +| PIDD_URL_ALMA | Alma repository URL | https://repo.almalinux.org | +| PIDD_URL_ALPINE | Alpine repository URL | https://dl-cdn.alpinelinux.org | +| PIDD_URL_ARCH | Arch repository URL | https://geo.mirror.pkgbuild.com | +| PIDD_URL_DEBIAN | Debian repository URL | https://deb.debian.org | +| PIDD_URL_FEDORA | Fedora repository URL | https://rpmfind.net | +| PIDD_URL_ROCKY | Rocky repository URL | https://dl.rockylinux.org | +| PIDD_URL_UBUNTU | Ubuntu repository URL | https://ubuntu.mirrors.ovh.net | ## HTTPS & Python From 1166653935bd314e938a14d48bbe83726009c74a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 21 Jun 2024 15:01:29 +0200 Subject: [PATCH 16/21] package,project,readme --- pidd/__init__.py | 2 +- pyproject.toml | 2 +- readme.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pidd/__init__.py b/pidd/__init__.py index 7ddf07f..9df594e 100644 --- a/pidd/__init__.py +++ b/pidd/__init__.py @@ -1,4 +1,4 @@ -"""Continuous Integration, Delivery & Deployment.""" +"""Python Integration, Delivery & Deployment.""" __version__ = "0.0.1" diff --git a/pyproject.toml b/pyproject.toml index 8b9edb0..e48d346 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = ["rwx"] -description = "Continuous Integration, Delivery & Deployment" +description = "Python Integration, Delivery & Deployment" dynamic = ["version"] keywords = [] license-files = { paths = ["license.md"] } diff --git a/readme.md b/readme.md index 69fb1b5..6b0a038 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# Continuous Integration, Delivery & Deployment +# Python Integration, Delivery & Deployment Get a common set of Python CI & CD commands \ from various contexts of CA, CI and OCI / OS. From 46305b4a6c3071bc7caffc8367f7730bbbac6211 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 21 Jun 2024 16:12:58 +0200 Subject: [PATCH 17/21] child --- pidd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pidd.sh b/pidd.sh index 83d40b9..44453fa 100644 --- a/pidd.sh +++ b/pidd.sh @@ -4,7 +4,7 @@ [ -n "${PIDD_DNS}" ] || PIDD_DNS="\ 9.9.9.9 \ " -[ -n "${PIDD_GIT_CHILD}" ] || PIDD_GIT_CHILD="cd" +[ -n "${PIDD_GIT_CHILD}" ] || PIDD_GIT_CHILD="pidd" [ -n "${PIDD_GIT_PARENT}" ] || PIDD_GIT_PARENT="rwx" # main From 2a4e37a5eb61ef17c228d46fa9d9075c0788f8ec Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 21 Jun 2024 16:26:33 +0200 Subject: [PATCH 18/21] main/main --- pidd/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pidd/__init__.py b/pidd/__init__.py index 9df594e..db868ff 100644 --- a/pidd/__init__.py +++ b/pidd/__init__.py @@ -115,12 +115,12 @@ def install_commands(path: str) -> None: (user / f"{COMMANDS_PREFIX}{command}").symlink_to(path) -def main() -> None: +def main(main: str) -> None: path, *arguments = sys.argv name = Path(path).name if name == "__main__.py": pidd.set_ssh(*arguments) - pidd.install_commands(__file__) + pidd.install_commands(main) else: function = getattr(pidd, name.replace("-", "_")) function(*arguments) From 7405da845dc30246f1642bb84fe3d99420096568 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 22 Jun 2024 12:39:06 +0200 Subject: [PATCH 19/21] remove old args --- pidd/__init__.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pidd/__init__.py b/pidd/__init__.py index db868ff..deda9af 100644 --- a/pidd/__init__.py +++ b/pidd/__init__.py @@ -39,14 +39,10 @@ def pidd_clone_branch() -> None: split() log.info(project) split() - log.info( - f"""\ + log.info(f"""\ {project.url} ↓ -""", - end="", - flush=True, - ) +""") ps.run( "git", "clone", From 8004c604b38754da34f3c0a8bc6808a6a25b4f7a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 23 Jun 2024 16:27:59 +0200 Subject: [PATCH 20/21] pidd_list_environment_variables --- pidd.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pidd.sh b/pidd.sh index 44453fa..52ddf6c 100644 --- a/pidd.sh +++ b/pidd.sh @@ -13,6 +13,7 @@ pidd_main () { pidd_set_packages_repositories pidd_set_packages_configuration # + pidd_list_environment_variables pidd_list_working_directory pidd_set_https_verification_off pidd_set_dns_resolving @@ -482,6 +483,11 @@ pidd_set_packages_configuration () { # agnostic steps +pidd_list_environment_variables () { + pidd_step "List environment variables" + env +} + pidd_list_working_directory () { pidd_step "List working directory" pidd_list_working_directory__path="$(realpath .)" From c494c59f0610feb0648ba8be33f5cc5b08772dbf Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 23 Jun 2024 17:03:45 +0200 Subject: [PATCH 21/21] sort environment variables --- pidd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pidd.sh b/pidd.sh index 52ddf6c..d59ab5b 100644 --- a/pidd.sh +++ b/pidd.sh @@ -485,7 +485,7 @@ pidd_set_packages_configuration () { pidd_list_environment_variables () { pidd_step "List environment variables" - env + env | sort } pidd_list_working_directory () {