From b0e45d5ec39b4c109f128f3c88acada04b8366f3 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 16:23:02 +0200 Subject: [PATCH 01/28] cd_ca --- cd.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cd.sh b/cd.sh index bc4a618..984bbe0 100644 --- a/cd.sh +++ b/cd.sh @@ -42,8 +42,6 @@ cd_main () { cd_set_environment_variables () { cd_step "Set environment variables" # - [ "${CD_CA_1}" ] && CD_CA=true - # case "$(cd_grep_os ID)" in "almalinux") CD_OS_ID="${CD_OS_ALMA}" @@ -149,6 +147,8 @@ Dir::Etc::SourceParts \"\"; ;; *) cd_error_os "CD_OS_ID" ;; esac + # variables + [ "${CD_CA_1}" ] && CD_CA=true # continuous integration platform if [ "${GITHUB_ACTIONS}" ] ; then # forgejo / gitea / github @@ -175,7 +175,7 @@ Dir::Etc::SourceParts \"\"; CD_PROJECTS_URL="${CD_SERVER_URL}/${CD_PROJECTS_GROUP}" CD_PROJECT_URL="${CD_PROJECTS_URL}/${CD_PROJECT_NAME}" # - cd_echo "CD_CA" "CD_CA_ROOT" + cd_echo "CD_CA_ROOT" cd_split cd_echo "CD_OS_ID" "CD_OS_VERSION" cd_split @@ -190,6 +190,8 @@ Dir::Etc::SourceParts \"\"; cd_split cd_echo "CD_PYTHON_COMMAND" "CD_PYTHON_PACKAGE" "CD_PYTHON_PACKAGES" cd_split + cd_echo "CD_CA" + cd_split cd_echo "CD_SERVER_URL" \ "CD_PROJECTS_GROUP" "CD_PROJECT_NAME" "CD_PROJECT_BRANCH" cd_split From ccd946432906b69cf8b82b8d2c8075b221a698a1 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 16:30:40 +0200 Subject: [PATCH 02/28] universal --- cd.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/cd.sh b/cd.sh index 984bbe0..88d7d0c 100644 --- a/cd.sh +++ b/cd.sh @@ -41,7 +41,7 @@ cd_main () { cd_set_environment_variables () { cd_step "Set environment variables" - # + # operating system case "$(cd_grep_os ID)" in "almalinux") CD_OS_ID="${CD_OS_ALMA}" @@ -58,7 +58,7 @@ cd_set_environment_variables () { CD_OS_VERSION="$(cd_grep_os VERSION_CODENAME)" ;; esac - # + # universal CD_DNS_FILE="/etc/resolv.conf" CD_PKG_CA="ca-certificates" CD_PKG_GIT="git" @@ -166,7 +166,6 @@ Dir::Etc::SourceParts \"\"; # unsupported cd_error_ci "ø" fi - # [ "${CD_SERVER_URL}" ] || cd_error_ci "CD_SERVER_URL" [ "${CD_PROJECTS_GROUP}" ] || cd_error_ci "CD_PROJECTS_GROUP" [ "${CD_PROJECT_NAME}" ] || cd_error_ci "CD_PROJECT_NAME" @@ -175,16 +174,16 @@ Dir::Etc::SourceParts \"\"; CD_PROJECTS_URL="${CD_SERVER_URL}/${CD_PROJECTS_GROUP}" CD_PROJECT_URL="${CD_PROJECTS_URL}/${CD_PROJECT_NAME}" # - cd_echo "CD_CA_ROOT" - cd_split cd_echo "CD_OS_ID" "CD_OS_VERSION" cd_split + cd_echo "CD_DNS_FILE" "CD_PKG_CA" "CD_PKG_GIT" + cd_split + cd_echo "CD_CA_ROOT" + cd_split cd_echo "CD_CMD_CA" \ "CD_CMD_CLEAN" "CD_CMD_INSTALL" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" cd_split - cd_echo "CD_DNS_FILE" - cd_split - cd_echo "CD_PKG_CA" "CD_PKG_GIT" "CD_PKG_PKG" + cd_echo "CD_PKG_PKG" cd_split cd_echo "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH" cd_split From 1f1cd59e1948f095e730c3b32bdc964ec0cec863 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 17:10:00 +0200 Subject: [PATCH 03/28] wip/common --- cd.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cd.sh b/cd.sh index 88d7d0c..80e9ee7 100644 --- a/cd.sh +++ b/cd.sh @@ -42,7 +42,8 @@ cd_main () { cd_set_environment_variables () { cd_step "Set environment variables" # operating system - case "$(cd_grep_os ID)" in + CD_OS_ID="$(cd_grep_os ID)" + case "${CD_OS_ID}" in "almalinux") CD_OS_ID="${CD_OS_ALMA}" CD_OS_VERSION=$(cd_grep_os VERSION_ID \ @@ -57,11 +58,15 @@ cd_set_environment_variables () { CD_OS_ID="${CD_OS_DEBIAN}" CD_OS_VERSION="$(cd_grep_os VERSION_CODENAME)" ;; + *) cd_error_os "CD_OS_ID" ;; esac # universal CD_DNS_FILE="/etc/resolv.conf" CD_PKG_CA="ca-certificates" CD_PKG_GIT="git" + # common + case "${CD_OS_ID}" in + esac # case "${CD_OS_ID}" in "${CD_OS_ALMA}") @@ -145,7 +150,6 @@ Dir::Etc::SourceParts \"\"; CD_PYTHON_PACKAGE="python3" CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages" ;; - *) cd_error_os "CD_OS_ID" ;; esac # variables [ "${CD_CA_1}" ] && CD_CA=true From 1d29cdf637d16182992fd6b02c3246edfc208994 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 17:10:35 +0200 Subject: [PATCH 04/28] readme/rocky,ubuntu --- readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/readme.md b/readme.md index 89968dc..5123f2b 100644 --- a/readme.md +++ b/readme.md @@ -14,6 +14,7 @@ from various CA, CI, OCI / OS. * [X] Alpine * [X] Debian * [ ] Rocky + * [ ] Ubuntu * [ ] Continuous Integration platforms * [X] GitHub → Gitea → ForgeJo * [X] GitLab @@ -28,6 +29,8 @@ from various CA, CI, OCI / OS. | CD_REPO_ALMA | Alma repository URL | | CD_REPO_ALPINE | Alpine repository URL | | CD_REPO_DEBIAN | Debian repository URL | +| CD_REPO_ROCKY | Rocky repository URL | +| CD_REPO_UBUNTU | Ubuntu repository URL | ## Tasks From a70fa248c067a136d0b79873bb8f1877d4f9db74 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 17:12:08 +0200 Subject: [PATCH 05/28] wip/rocky,ubuntu --- cd.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cd.sh b/cd.sh index 80e9ee7..8348ba5 100644 --- a/cd.sh +++ b/cd.sh @@ -7,6 +7,8 @@ CD_DEFAULT_DNS="\ CD_DEFAULT_REPO_ALMA="https://repo.almalinux.org/almalinux" CD_DEFAULT_REPO_ALPINE="https://dl-cdn.alpinelinux.org/alpine" CD_DEFAULT_REPO_DEBIAN="https://deb.debian.org/debian" +CD_DEFAULT_REPO_ROCKY="http://dl.rockylinux.org/\$contentdir" +CD_DEFAULT_REPO_UBUNTU="http://archive.ubuntu.com/ubuntu" CD_PYTHON_MODULES="\ cd \ @@ -66,6 +68,8 @@ cd_set_environment_variables () { CD_PKG_GIT="git" # common case "${CD_OS_ID}" in + "${CD_OS_ALMA}"|"${CD_OS_ROCKY}") + ;; esac # case "${CD_OS_ID}" in @@ -505,6 +509,8 @@ CD_ERROR_OS=1 CD_OS_ALMA="alma" CD_OS_ALPINE="alpine" CD_OS_DEBIAN="debian" +CD_OS_ROCKY="rocky" +CD_OS_UBUNTU="ubuntu" # run cd_main From dcd919e8a811bdca940071d92dbe9d7637188f06 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 17:25:36 +0200 Subject: [PATCH 06/28] wip/os --- cd.sh | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/cd.sh b/cd.sh index 8348ba5..81e4e8f 100644 --- a/cd.sh +++ b/cd.sh @@ -46,22 +46,27 @@ cd_set_environment_variables () { # operating system CD_OS_ID="$(cd_grep_os ID)" case "${CD_OS_ID}" in - "almalinux") - CD_OS_ID="${CD_OS_ALMA}" + "almalinux") CD_OS_ID="${CD_OS_ALMA}" ;; + "alpine") CD_OS_ID="${CD_OS_ALPINE}" ;; + "debian") CD_OS_ID="${CD_OS_DEBIAN}" ;; + "rocky") CD_OS_ID="${CD_OS_ROCKY}" ;; + "ubuntu") CD_OS_ID="${CD_OS_UBUNTU}" ;; + *) cd_error_os "CD_OS_ID" ;; + esac + case "${CD_OS_ID}" in + "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") + CD_OS_VERSION="$(cd_grep_os VERSION_CODENAME)" + ;; + "${CD_OS_ALMA}"|"${CD_OS_ROCKY}") CD_OS_VERSION=$(cd_grep_os VERSION_ID \ | sed "s|^\([0-9]\+\)\..*|\1|") ;; - "alpine") - CD_OS_ID="${CD_OS_ALPINE}" + "${CD_OS_ALPINE}") CD_OS_VERSION=$(cd_grep_os VERSION_ID \ | sed "s|^\([0-9]\+\.[0-9]\+\)\..*|\1|") ;; - "debian") - CD_OS_ID="${CD_OS_DEBIAN}" - CD_OS_VERSION="$(cd_grep_os VERSION_CODENAME)" - ;; - *) cd_error_os "CD_OS_ID" ;; esac + cd_echo "CD_OS_ID" "CD_OS_VERSION" # universal CD_DNS_FILE="/etc/resolv.conf" CD_PKG_CA="ca-certificates" @@ -182,7 +187,6 @@ Dir::Etc::SourceParts \"\"; CD_PROJECTS_URL="${CD_SERVER_URL}/${CD_PROJECTS_GROUP}" CD_PROJECT_URL="${CD_PROJECTS_URL}/${CD_PROJECT_NAME}" # - cd_echo "CD_OS_ID" "CD_OS_VERSION" cd_split cd_echo "CD_DNS_FILE" "CD_PKG_CA" "CD_PKG_GIT" cd_split From 3a5350654d08cc4e0dc549f6cc1bc38b29ba9df6 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 17:28:26 +0200 Subject: [PATCH 07/28] rockylinux --- .forgejo/workflows/rockylinux:8.yaml | 13 +++++++++++++ .forgejo/workflows/rockylinux:9.yaml | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 .forgejo/workflows/rockylinux:8.yaml create mode 100644 .forgejo/workflows/rockylinux:9.yaml diff --git a/.forgejo/workflows/rockylinux:8.yaml b/.forgejo/workflows/rockylinux:8.yaml new file mode 100644 index 0000000..14b52d2 --- /dev/null +++ b/.forgejo/workflows/rockylinux:8.yaml @@ -0,0 +1,13 @@ +on: [push] +jobs: + job: + container: + image: rockylinux:8 + steps: + - name: cd + env: + CD: ${{secrets.cd}} + run: eval ${{vars.cd}} + + - run: cd-list-environment + - run: cd-browse-workspace diff --git a/.forgejo/workflows/rockylinux:9.yaml b/.forgejo/workflows/rockylinux:9.yaml new file mode 100644 index 0000000..a29242e --- /dev/null +++ b/.forgejo/workflows/rockylinux:9.yaml @@ -0,0 +1,13 @@ +on: [push] +jobs: + job: + container: + image: rockylinux:9 + steps: + - name: cd + env: + CD: ${{secrets.cd}} + run: eval ${{vars.cd}} + + - run: cd-list-environment + - run: cd-browse-workspace From fb2ccf9cbcaf0e68cfc1b85e699591456e08d643 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 17:30:35 +0200 Subject: [PATCH 08/28] ubuntu --- .forgejo/workflows/ubuntu:mantic.yaml | 13 +++++++++++++ .forgejo/workflows/ubuntu:noble.yaml | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 .forgejo/workflows/ubuntu:mantic.yaml create mode 100644 .forgejo/workflows/ubuntu:noble.yaml diff --git a/.forgejo/workflows/ubuntu:mantic.yaml b/.forgejo/workflows/ubuntu:mantic.yaml new file mode 100644 index 0000000..4dc9767 --- /dev/null +++ b/.forgejo/workflows/ubuntu:mantic.yaml @@ -0,0 +1,13 @@ +on: [push] +jobs: + job: + container: + image: ubuntu:mantic + steps: + - name: cd + env: + CD: ${{secrets.cd}} + run: eval ${{vars.cd}} + + - run: cd-list-environment + - run: cd-browse-workspace diff --git a/.forgejo/workflows/ubuntu:noble.yaml b/.forgejo/workflows/ubuntu:noble.yaml new file mode 100644 index 0000000..e620719 --- /dev/null +++ b/.forgejo/workflows/ubuntu:noble.yaml @@ -0,0 +1,13 @@ +on: [push] +jobs: + job: + container: + image: ubuntu:noble + steps: + - name: cd + env: + CD: ${{secrets.cd}} + run: eval ${{vars.cd}} + + - run: cd-list-environment + - run: cd-browse-workspace From 7d4538b523c35318ef7a5a2eac456c112efa9f61 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 17:37:32 +0200 Subject: [PATCH 09/28] wip/universal --- cd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cd.sh b/cd.sh index 81e4e8f..235813b 100644 --- a/cd.sh +++ b/cd.sh @@ -71,6 +71,8 @@ cd_set_environment_variables () { CD_DNS_FILE="/etc/resolv.conf" CD_PKG_CA="ca-certificates" CD_PKG_GIT="git" + cd_split + cd_echo "CD_DNS_FILE" "CD_PKG_CA" "CD_PKG_GIT" # common case "${CD_OS_ID}" in "${CD_OS_ALMA}"|"${CD_OS_ROCKY}") @@ -188,8 +190,6 @@ Dir::Etc::SourceParts \"\"; CD_PROJECT_URL="${CD_PROJECTS_URL}/${CD_PROJECT_NAME}" # cd_split - cd_echo "CD_DNS_FILE" "CD_PKG_CA" "CD_PKG_GIT" - cd_split cd_echo "CD_CA_ROOT" cd_split cd_echo "CD_CMD_CA" \ From db70b8fbbfc9ccf0f8208dc055ff9ba9be41782d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 17:47:07 +0200 Subject: [PATCH 10/28] wip/shared --- cd.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/cd.sh b/cd.sh index 235813b..f92cd02 100644 --- a/cd.sh +++ b/cd.sh @@ -73,11 +73,18 @@ cd_set_environment_variables () { CD_PKG_GIT="git" cd_split cd_echo "CD_DNS_FILE" "CD_PKG_CA" "CD_PKG_GIT" - # common + # shared case "${CD_OS_ID}" in "${CD_OS_ALMA}"|"${CD_OS_ROCKY}") + CD_CA_ROOT="/etc/pki/ca-trust/source/anchors" + ;; + "${CD_OS_ALPINE}"|"${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") + CD_CA_ROOT="/usr/local/share/ca-certificates" ;; esac + cd_split + cd_echo "CD_CA_ROOT" + # common # case "${CD_OS_ID}" in "${CD_OS_ALMA}") @@ -87,7 +94,6 @@ cd_set_environment_variables () { "8"|"9") ;; *) cd_error_os "CD_OS_VERSION" ;; esac - CD_CA_ROOT="/etc/pki/ca-trust/source/anchors" CD_CMD_CA="update-ca-trust" CD_CMD_CLEAN="dnf clean all" CD_CMD_INSTALL="dnf install --assumeyes" @@ -116,7 +122,6 @@ skip_if_unavailable=False "3.18"|"3.19") ;; *) cd_error_os "CD_OS_VERSION" ;; esac - CD_CA_ROOT="/usr/local/share/ca-certificates" CD_CMD_CA="update-ca-certificates" CD_CMD_CLEAN="apk cache purge" CD_CMD_INSTALL="apk add" @@ -141,7 +146,6 @@ skip_if_unavailable=False "bullseye") CD_PYTHON_COMMAND="python3.9" ;; *) cd_error_os "CD_OS_VERSION" ;; esac - CD_CA_ROOT="/usr/local/share/ca-certificates" CD_CMD_CA="update-ca-certificates" CD_CMD_CLEAN="apt-get clean" CD_CMD_INSTALL="apt-get install --assume-yes" @@ -190,8 +194,6 @@ Dir::Etc::SourceParts \"\"; CD_PROJECT_URL="${CD_PROJECTS_URL}/${CD_PROJECT_NAME}" # cd_split - cd_echo "CD_CA_ROOT" - cd_split cd_echo "CD_CMD_CA" \ "CD_CMD_CLEAN" "CD_CMD_INSTALL" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" cd_split From 7688ea0221ef92cb35276a0c96d0de0d242e1031 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 17:50:43 +0200 Subject: [PATCH 11/28] wip/shared --- cd.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/cd.sh b/cd.sh index f92cd02..b9ded73 100644 --- a/cd.sh +++ b/cd.sh @@ -77,14 +77,24 @@ cd_set_environment_variables () { case "${CD_OS_ID}" in "${CD_OS_ALMA}"|"${CD_OS_ROCKY}") CD_CA_ROOT="/etc/pki/ca-trust/source/anchors" + CD_CMD_CA="update-ca-trust" ;; "${CD_OS_ALPINE}"|"${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") CD_CA_ROOT="/usr/local/share/ca-certificates" + CD_CMD_CA="update-ca-certificates" ;; esac cd_split - cd_echo "CD_CA_ROOT" + cd_echo "CD_CA_ROOT" "CD_CMD_CA" # common + case "${CD_OS_ID}" in + "${CD_OS_ALMA}"|"${CD_OS_ROCKY}") + ;; + "${CD_OS_ALPINE}") + ;; + "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") + ;; + esac # case "${CD_OS_ID}" in "${CD_OS_ALMA}") @@ -94,7 +104,6 @@ cd_set_environment_variables () { "8"|"9") ;; *) cd_error_os "CD_OS_VERSION" ;; esac - CD_CMD_CA="update-ca-trust" CD_CMD_CLEAN="dnf clean all" CD_CMD_INSTALL="dnf install --assumeyes" CD_CMD_UPDATE="dnf makecache" @@ -122,7 +131,6 @@ skip_if_unavailable=False "3.18"|"3.19") ;; *) cd_error_os "CD_OS_VERSION" ;; esac - CD_CMD_CA="update-ca-certificates" CD_CMD_CLEAN="apk cache purge" CD_CMD_INSTALL="apk add" CD_CMD_UPDATE="apk update" @@ -146,7 +154,6 @@ skip_if_unavailable=False "bullseye") CD_PYTHON_COMMAND="python3.9" ;; *) cd_error_os "CD_OS_VERSION" ;; esac - CD_CMD_CA="update-ca-certificates" CD_CMD_CLEAN="apt-get clean" CD_CMD_INSTALL="apt-get install --assume-yes" CD_CMD_UPDATE="apt-get update" @@ -194,8 +201,7 @@ Dir::Etc::SourceParts \"\"; CD_PROJECT_URL="${CD_PROJECTS_URL}/${CD_PROJECT_NAME}" # cd_split - cd_echo "CD_CMD_CA" \ - "CD_CMD_CLEAN" "CD_CMD_INSTALL" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" + cd_echo "CD_CMD_CLEAN" "CD_CMD_INSTALL" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" cd_split cd_echo "CD_PKG_PKG" cd_split From 1181e2411f140299bedb13bbd605683cfbc95671 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 17:54:04 +0200 Subject: [PATCH 12/28] wip/clean,install,update,upgrade --- cd.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/cd.sh b/cd.sh index b9ded73..a2cc590 100644 --- a/cd.sh +++ b/cd.sh @@ -89,12 +89,26 @@ cd_set_environment_variables () { # common case "${CD_OS_ID}" in "${CD_OS_ALMA}"|"${CD_OS_ROCKY}") + CD_CMD_CLEAN="dnf clean all" + CD_CMD_INSTALL="dnf install --assumeyes" + CD_CMD_UPDATE="dnf makecache" + CD_CMD_UPGRADE="dnf upgrade --assumeyes" ;; "${CD_OS_ALPINE}") + CD_CMD_CLEAN="apk cache purge" + CD_CMD_INSTALL="apk add" + CD_CMD_UPDATE="apk update" + CD_CMD_UPGRADE="apk upgrade" ;; "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") + CD_CMD_CLEAN="apt-get clean" + CD_CMD_INSTALL="apt-get install --assume-yes" + CD_CMD_UPDATE="apt-get update" + CD_CMD_UPGRADE="apt-get upgrade --assume-yes" ;; esac + cd_split + cd_echo "CD_CMD_CLEAN" "CD_CMD_INSTALL" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" # case "${CD_OS_ID}" in "${CD_OS_ALMA}") @@ -104,10 +118,6 @@ cd_set_environment_variables () { "8"|"9") ;; *) cd_error_os "CD_OS_VERSION" ;; esac - CD_CMD_CLEAN="dnf clean all" - CD_CMD_INSTALL="dnf install --assumeyes" - CD_CMD_UPDATE="dnf makecache" - CD_CMD_UPGRADE="dnf upgrade --assumeyes" CD_PKG_PKG="" CD_PM_CONF_PATH="/etc/dnf/dnf.conf" CD_PM_CONF_TEXT="\ @@ -131,10 +141,6 @@ skip_if_unavailable=False "3.18"|"3.19") ;; *) cd_error_os "CD_OS_VERSION" ;; esac - CD_CMD_CLEAN="apk cache purge" - CD_CMD_INSTALL="apk add" - CD_CMD_UPDATE="apk update" - CD_CMD_UPGRADE="apk upgrade" CD_PKG_PKG="" CD_PM_CONF_PATH="" CD_PM_CONF_TEXT="" @@ -154,10 +160,6 @@ skip_if_unavailable=False "bullseye") CD_PYTHON_COMMAND="python3.9" ;; *) cd_error_os "CD_OS_VERSION" ;; esac - CD_CMD_CLEAN="apt-get clean" - CD_CMD_INSTALL="apt-get install --assume-yes" - CD_CMD_UPDATE="apt-get update" - CD_CMD_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="\ @@ -201,8 +203,6 @@ Dir::Etc::SourceParts \"\"; CD_PROJECT_URL="${CD_PROJECTS_URL}/${CD_PROJECT_NAME}" # cd_split - cd_echo "CD_CMD_CLEAN" "CD_CMD_INSTALL" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" - cd_split cd_echo "CD_PKG_PKG" cd_split cd_echo "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH" From 61c2ab7f7f40bb8ab213e20683c677e93e69aa3a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 18:00:01 +0200 Subject: [PATCH 13/28] wip/todo --- cd.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cd.sh b/cd.sh index a2cc590..f4b53ba 100644 --- a/cd.sh +++ b/cd.sh @@ -109,7 +109,7 @@ cd_set_environment_variables () { esac cd_split cd_echo "CD_CMD_CLEAN" "CD_CMD_INSTALL" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" - # + # TODO case "${CD_OS_ID}" in "${CD_OS_ALMA}") CD_OS_REPO="${CD_DEFAULT_REPO_ALMA}" @@ -175,6 +175,12 @@ Dir::Etc::SourceParts \"\"; CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages" ;; esac + cd_split + cd_echo "CD_PKG_PKG" + cd_split + cd_echo "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH" + cd_split + cd_echo "CD_PYTHON_COMMAND" "CD_PYTHON_PACKAGE" "CD_PYTHON_PACKAGES" # variables [ "${CD_CA_1}" ] && CD_CA=true # continuous integration platform @@ -203,12 +209,6 @@ Dir::Etc::SourceParts \"\"; CD_PROJECT_URL="${CD_PROJECTS_URL}/${CD_PROJECT_NAME}" # cd_split - cd_echo "CD_PKG_PKG" - cd_split - cd_echo "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH" - cd_split - cd_echo "CD_PYTHON_COMMAND" "CD_PYTHON_PACKAGE" "CD_PYTHON_PACKAGES" - cd_split cd_echo "CD_CA" cd_split cd_echo "CD_SERVER_URL" \ From 0c17f026ea0bb30be5a929be3325acd76198eb87 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 18:16:12 +0200 Subject: [PATCH 14/28] wip/conf,https --- cd.sh | 84 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/cd.sh b/cd.sh index f4b53ba..251169f 100644 --- a/cd.sh +++ b/cd.sh @@ -93,32 +93,6 @@ cd_set_environment_variables () { CD_CMD_INSTALL="dnf install --assumeyes" CD_CMD_UPDATE="dnf makecache" CD_CMD_UPGRADE="dnf upgrade --assumeyes" - ;; - "${CD_OS_ALPINE}") - CD_CMD_CLEAN="apk cache purge" - CD_CMD_INSTALL="apk add" - CD_CMD_UPDATE="apk update" - CD_CMD_UPGRADE="apk upgrade" - ;; - "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") - CD_CMD_CLEAN="apt-get clean" - CD_CMD_INSTALL="apt-get install --assume-yes" - CD_CMD_UPDATE="apt-get update" - CD_CMD_UPGRADE="apt-get upgrade --assume-yes" - ;; - esac - cd_split - cd_echo "CD_CMD_CLEAN" "CD_CMD_INSTALL" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" - # TODO - case "${CD_OS_ID}" in - "${CD_OS_ALMA}") - CD_OS_REPO="${CD_DEFAULT_REPO_ALMA}" - [ "${CD_REPO_ALMA}" ] && CD_OS_REPO="${CD_REPO_ALMA}" - case "${CD_OS_VERSION}" in - "8"|"9") ;; - *) cd_error_os "CD_OS_VERSION" ;; - esac - CD_PKG_PKG="" CD_PM_CONF_PATH="/etc/dnf/dnf.conf" CD_PM_CONF_TEXT="\ [main] @@ -130,6 +104,48 @@ skip_if_unavailable=False " CD_PM_HTTPS_PATH="/etc/dnf/dnf.conf.d/https.conf" CD_PM_HTTPS_TEXT="sslverify=False" + ;; + "${CD_OS_ALPINE}") + CD_CMD_CLEAN="apk cache purge" + CD_CMD_INSTALL="apk add" + CD_CMD_UPDATE="apk update" + CD_CMD_UPGRADE="apk upgrade" + CD_PM_CONF_PATH="" + CD_PM_CONF_TEXT="" + CD_PM_HTTPS_PATH="/etc/apk/repositories.d/https" + CD_PM_HTTPS_TEXT="--no-verify" + ;; + "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") + CD_CMD_CLEAN="apt-get clean" + CD_CMD_INSTALL="apt-get install --assume-yes" + CD_CMD_UPDATE="apt-get update" + CD_CMD_UPGRADE="apt-get upgrade --assume-yes" + CD_PM_CONF_PATH="/etc/apt/apt.conf.d/apt.conf" + CD_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="Acquire::https::Verify-Peer False;" + ;; + esac + cd_split + cd_echo "CD_CMD_CLEAN" "CD_CMD_INSTALL" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" + cd_split + cd_echo "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH" + # TODO + case "${CD_OS_ID}" in + "${CD_OS_ALMA}") + CD_OS_REPO="${CD_DEFAULT_REPO_ALMA}" + [ "${CD_REPO_ALMA}" ] && CD_OS_REPO="${CD_REPO_ALMA}" + case "${CD_OS_VERSION}" in + "8"|"9") ;; + *) cd_error_os "CD_OS_VERSION" ;; + esac + CD_PKG_PKG="" CD_PYTHON_COMMAND="python3.11" CD_PYTHON_PACKAGE="python3.11" CD_PYTHON_PACKAGES="/usr/lib64/python3.11/site-packages" @@ -142,10 +158,6 @@ skip_if_unavailable=False *) cd_error_os "CD_OS_VERSION" ;; esac CD_PKG_PKG="" - CD_PM_CONF_PATH="" - CD_PM_CONF_TEXT="" - CD_PM_HTTPS_PATH="/etc/apk/repositories.d/https" - CD_PM_HTTPS_TEXT="--no-verify" CD_PYTHON_COMMAND="python3.11" CD_PYTHON_PACKAGE="python3" CD_PYTHON_PACKAGES="/usr/lib/python3.11/site-packages" @@ -161,16 +173,6 @@ skip_if_unavailable=False *) cd_error_os "CD_OS_VERSION" ;; esac CD_PKG_PKG="apt-utils" - CD_PM_CONF_PATH="/etc/apt/apt.conf.d/apt.conf" - CD_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="Acquire::https::Verify-Peer False;" CD_PYTHON_PACKAGE="python3" CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages" ;; @@ -178,8 +180,6 @@ Dir::Etc::SourceParts \"\"; cd_split cd_echo "CD_PKG_PKG" cd_split - cd_echo "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH" - cd_split cd_echo "CD_PYTHON_COMMAND" "CD_PYTHON_PACKAGE" "CD_PYTHON_PACKAGES" # variables [ "${CD_CA_1}" ] && CD_CA=true From 0470fa8de80162dedeaa5f140c9520793a1b283c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 18:27:32 +0200 Subject: [PATCH 15/28] wip/versions --- cd.sh | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/cd.sh b/cd.sh index 251169f..d8e02dc 100644 --- a/cd.sh +++ b/cd.sh @@ -66,6 +66,32 @@ cd_set_environment_variables () { | sed "s|^\([0-9]\+\.[0-9]\+\)\..*|\1|") ;; esac + case "${CD_OS_ID}" in + "${CD_OS_ALMA}"|"${CD_OS_ROCKY}") + case "${CD_OS_VERSION}" in + "8"|"9") ;; + *) cd_error_os "CD_OS_VERSION" ;; + esac + ;; + "${CD_OS_ALPINE}") + case "${CD_OS_VERSION}" in + "3.18"|"3.19") ;; + *) cd_error_os "CD_OS_VERSION" ;; + esac + ;; + "${CD_OS_DEBIAN}") + case "${CD_OS_VERSION}" in + "bookworm"|"bullseye") ;; + *) cd_error_os "CD_OS_VERSION" ;; + esac + ;; + "${CD_OS_UBUNTU}") + case "${CD_OS_VERSION}" in + "noble"|"mantic") ;; + *) cd_error_os "CD_OS_VERSION" ;; + esac + ;; + esac cd_echo "CD_OS_ID" "CD_OS_VERSION" # universal CD_DNS_FILE="/etc/resolv.conf" @@ -141,10 +167,6 @@ Dir::Etc::SourceParts \"\"; "${CD_OS_ALMA}") CD_OS_REPO="${CD_DEFAULT_REPO_ALMA}" [ "${CD_REPO_ALMA}" ] && CD_OS_REPO="${CD_REPO_ALMA}" - case "${CD_OS_VERSION}" in - "8"|"9") ;; - *) cd_error_os "CD_OS_VERSION" ;; - esac CD_PKG_PKG="" CD_PYTHON_COMMAND="python3.11" CD_PYTHON_PACKAGE="python3.11" @@ -153,10 +175,6 @@ Dir::Etc::SourceParts \"\"; "${CD_OS_ALPINE}") CD_OS_REPO="${CD_DEFAULT_REPO_ALPINE}" [ "${CD_REPO_ALPINE}" ] && CD_OS_REPO="${CD_REPO_ALPINE}" - case "${CD_OS_VERSION}" in - "3.18"|"3.19") ;; - *) cd_error_os "CD_OS_VERSION" ;; - esac CD_PKG_PKG="" CD_PYTHON_COMMAND="python3.11" CD_PYTHON_PACKAGE="python3" From 033b2b84938be8295ebed8a9b261e40bbed1ce14 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 18:54:24 +0200 Subject: [PATCH 16/28] wip/python --- cd.sh | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/cd.sh b/cd.sh index d8e02dc..fc11d76 100644 --- a/cd.sh +++ b/cd.sh @@ -162,43 +162,51 @@ Dir::Etc::SourceParts \"\"; cd_echo "CD_CMD_CLEAN" "CD_CMD_INSTALL" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" cd_split cd_echo "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH" + # TODO python + case "${CD_OS_ID}" in + "${CD_OS_ALMA}") + CD_PYTHON_COMMAND="python3.11" + CD_PYTHON_PACKAGE="python3.11" + CD_PYTHON_PACKAGES="/usr/lib64/python3.11/site-packages" + ;; + "${CD_OS_ALPINE}") + CD_PYTHON_COMMAND="python3.11" + CD_PYTHON_PACKAGE="python3" + CD_PYTHON_PACKAGES="/usr/lib/python3.11/site-packages" + ;; + "${CD_OS_DEBIAN}") + case "${CD_OS_VERSION}" in + "bookworm") CD_PYTHON_COMMAND="python3.11" ;; + "bullseye") CD_PYTHON_COMMAND="python3.9" ;; + esac + CD_PYTHON_PACKAGE="python3" + CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages" + ;; + esac + cd_split + cd_echo "CD_PYTHON_COMMAND" "CD_PYTHON_PACKAGE" "CD_PYTHON_PACKAGES" # TODO case "${CD_OS_ID}" in "${CD_OS_ALMA}") CD_OS_REPO="${CD_DEFAULT_REPO_ALMA}" [ "${CD_REPO_ALMA}" ] && CD_OS_REPO="${CD_REPO_ALMA}" CD_PKG_PKG="" - CD_PYTHON_COMMAND="python3.11" - CD_PYTHON_PACKAGE="python3.11" - CD_PYTHON_PACKAGES="/usr/lib64/python3.11/site-packages" ;; "${CD_OS_ALPINE}") CD_OS_REPO="${CD_DEFAULT_REPO_ALPINE}" [ "${CD_REPO_ALPINE}" ] && CD_OS_REPO="${CD_REPO_ALPINE}" CD_PKG_PKG="" - CD_PYTHON_COMMAND="python3.11" - CD_PYTHON_PACKAGE="python3" - CD_PYTHON_PACKAGES="/usr/lib/python3.11/site-packages" ;; "${CD_OS_DEBIAN}") export DEBIAN_FRONTEND="noninteractive" # CD_OS_REPO="${CD_DEFAULT_REPO_DEBIAN}" [ "${CD_REPO_DEBIAN}" ] && CD_OS_REPO="${CD_REPO_DEBIAN}" - case "${CD_OS_VERSION}" in - "bookworm") CD_PYTHON_COMMAND="python3.11" ;; - "bullseye") CD_PYTHON_COMMAND="python3.9" ;; - *) cd_error_os "CD_OS_VERSION" ;; - esac CD_PKG_PKG="apt-utils" - CD_PYTHON_PACKAGE="python3" - CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages" ;; esac cd_split cd_echo "CD_PKG_PKG" - cd_split - cd_echo "CD_PYTHON_COMMAND" "CD_PYTHON_PACKAGE" "CD_PYTHON_PACKAGES" # variables [ "${CD_CA_1}" ] && CD_CA=true # continuous integration platform From 53923ea1f012923618b4271d2314991394f976bc Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 19:33:07 +0200 Subject: [PATCH 17/28] wip/url --- cd.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cd.sh b/cd.sh index fc11d76..f37ace3 100644 --- a/cd.sh +++ b/cd.sh @@ -162,6 +162,16 @@ Dir::Etc::SourceParts \"\"; cd_echo "CD_CMD_CLEAN" "CD_CMD_INSTALL" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" cd_split cd_echo "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH" + # specific + case "${CD_OS_ID}" in + "${CD_OS_ALMA}") CD_PM_URL="https://repo.almalinux.org/almalinux" ;; + "${CD_OS_ALPINE}") CD_PM_URL="https://dl-cdn.alpinelinux.org/alpine" ;; + "${CD_OS_DEBIAN}") CD_PM_URL="http://deb.debian.org/debian" ;; + "${CD_OS_ROCKY}") CD_PM_URL="http://dl.rockylinux.org/\$contentdir" ;; + "${CD_OS_UBUNTU}") CD_PM_URL="http://archive.ubuntu.com/ubuntu" ;; + esac + cd_split + cd_echo "CD_PM_URL" # TODO python case "${CD_OS_ID}" in "${CD_OS_ALMA}") From 87a9a73f6cf814c4dff2b43fe6248364c7155c3c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 19:43:35 +0200 Subject: [PATCH 18/28] defaults --- cd.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cd.sh b/cd.sh index f37ace3..bfe12fe 100644 --- a/cd.sh +++ b/cd.sh @@ -4,11 +4,6 @@ CD_DEFAULT_DNS="\ 9.9.9.9 \ " -CD_DEFAULT_REPO_ALMA="https://repo.almalinux.org/almalinux" -CD_DEFAULT_REPO_ALPINE="https://dl-cdn.alpinelinux.org/alpine" -CD_DEFAULT_REPO_DEBIAN="https://deb.debian.org/debian" -CD_DEFAULT_REPO_ROCKY="http://dl.rockylinux.org/\$contentdir" -CD_DEFAULT_REPO_UBUNTU="http://archive.ubuntu.com/ubuntu" CD_PYTHON_MODULES="\ cd \ From f9b39eeb1502554d439fec36bdd793c47414a87b Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 20:17:46 +0200 Subject: [PATCH 19/28] wip/url --- cd.sh | 49 +++++++++++++++++++++++++++++++++++++------------ readme.md | 28 +++++++++++++++++++--------- 2 files changed, 56 insertions(+), 21 deletions(-) diff --git a/cd.sh b/cd.sh index bfe12fe..82b9beb 100644 --- a/cd.sh +++ b/cd.sh @@ -159,14 +159,45 @@ Dir::Etc::SourceParts \"\"; cd_echo "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH" # specific case "${CD_OS_ID}" in - "${CD_OS_ALMA}") CD_PM_URL="https://repo.almalinux.org/almalinux" ;; - "${CD_OS_ALPINE}") CD_PM_URL="https://dl-cdn.alpinelinux.org/alpine" ;; - "${CD_OS_DEBIAN}") CD_PM_URL="http://deb.debian.org/debian" ;; - "${CD_OS_ROCKY}") CD_PM_URL="http://dl.rockylinux.org/\$contentdir" ;; - "${CD_OS_UBUNTU}") CD_PM_URL="http://archive.ubuntu.com/ubuntu" ;; + "${CD_OS_ALMA}") + CD_URL_DEFAULT="https://repo.almalinux.org/almalinux" + ;; + "${CD_OS_ALPINE}") + CD_URL_DEFAULT="https://dl-cdn.alpinelinux.org/alpine" + ;; + "${CD_OS_DEBIAN}") + CD_URL_DEFAULT="http://deb.debian.org/debian" + ;; + "${CD_OS_ROCKY}") + CD_URL_DEFAULT="http://dl.rockylinux.org/\$contentdir" + ;; + "${CD_OS_UBUNTU}") + CD_URL_DEFAULT="http://archive.ubuntu.com/ubuntu" + ;; + esac + CD_URL_CHOSEN="${CD_URL_DEFAULT}" + case "${CD_OS_ID}" in + "${CD_OS_ALMA}") + [ "${CD_URL_ALMA}" ] && CD_URL_CHOSEN="${CD_URL_ALMA}" + ;; + "${CD_OS_ALPINE}") + [ "${CD_URL_ALPINE}" ] && CD_URL_CHOSEN="${CD_URL_ALPINE}" + ;; + "${CD_OS_DEBIAN}") + [ "${CD_URL_DEBIAN}" ] && CD_URL_CHOSEN="${CD_URL_DEBIAN}" \ + || CD_URL_CHOSEN="https://deb.debian.org/debian" + ;; + "${CD_OS_ROCKY}") + [ "${CD_URL_ROCKY}" ] && CD_URL_CHOSEN="${CD_URL_ROCKY}" \ + || CD_URL_CHOSEN="https://dl.rockylinux.org/\$contentdir" + ;; + "${CD_OS_UBUNTU}") + [ "${CD_URL_UBUNTU}" ] && CD_URL_CHOSEN="${CD_URL_UBUNTU}" \ + || CD_URL_CHOSEN="https://ubuntu.mirrors.ovh.net/ubuntu" + ;; esac cd_split - cd_echo "CD_PM_URL" + cd_echo "CD_URL_DEFAULT" "CD_URL_CHOSEN" # TODO python case "${CD_OS_ID}" in "${CD_OS_ALMA}") @@ -193,20 +224,14 @@ Dir::Etc::SourceParts \"\"; # TODO case "${CD_OS_ID}" in "${CD_OS_ALMA}") - CD_OS_REPO="${CD_DEFAULT_REPO_ALMA}" - [ "${CD_REPO_ALMA}" ] && CD_OS_REPO="${CD_REPO_ALMA}" CD_PKG_PKG="" ;; "${CD_OS_ALPINE}") - CD_OS_REPO="${CD_DEFAULT_REPO_ALPINE}" - [ "${CD_REPO_ALPINE}" ] && CD_OS_REPO="${CD_REPO_ALPINE}" CD_PKG_PKG="" ;; "${CD_OS_DEBIAN}") export DEBIAN_FRONTEND="noninteractive" # - CD_OS_REPO="${CD_DEFAULT_REPO_DEBIAN}" - [ "${CD_REPO_DEBIAN}" ] && CD_OS_REPO="${CD_REPO_DEBIAN}" CD_PKG_PKG="apt-utils" ;; esac diff --git a/readme.md b/readme.md index 5123f2b..4a7980e 100644 --- a/readme.md +++ b/readme.md @@ -11,10 +11,20 @@ from various CA, CI, OCI / OS. * [X] known CA certificates * [ ] Operating Systems * [X] Alma + * [X] 9 + * [X] 8 * [X] Alpine + * [X] 3.19 + * [X] 3.18 * [X] Debian + * [X] Bookworm + * [X] Bullseye * [ ] Rocky + * [ ] 9 + * [ ] 8 * [ ] Ubuntu + * [ ] Noble + * [ ] Mantic * [ ] Continuous Integration platforms * [X] GitHub → Gitea → ForgeJo * [X] GitLab @@ -22,15 +32,15 @@ from various CA, CI, OCI / OS. ## How -| Variable | Description | -|:---------------|:------------------------| -| CD_CA_n | Numbered CA certificate | -| CD_DNS | Space separated servers | -| CD_REPO_ALMA | Alma repository URL | -| CD_REPO_ALPINE | Alpine repository URL | -| CD_REPO_DEBIAN | Debian repository URL | -| CD_REPO_ROCKY | Rocky repository URL | -| CD_REPO_UBUNTU | Ubuntu repository URL | +| Variable | Description | +|:--------------|:------------------------| +| CD_CA_n | Numbered CA certificate | +| CD_DNS | Space separated servers | +| CD_URL_ALMA | Alma repository URL | +| CD_URL_ALPINE | Alpine repository URL | +| CD_URL_DEBIAN | Debian repository URL | +| CD_URL_ROCKY | Rocky repository URL | +| CD_URL_UBUNTU | Ubuntu repository URL | ## Tasks From bd78de879a2f697fd4b51174ebd7effa92a04327 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 20:35:29 +0200 Subject: [PATCH 20/28] wip/python --- cd.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cd.sh b/cd.sh index 82b9beb..fd72456 100644 --- a/cd.sh +++ b/cd.sh @@ -198,9 +198,9 @@ Dir::Etc::SourceParts \"\"; esac cd_split cd_echo "CD_URL_DEFAULT" "CD_URL_CHOSEN" - # TODO python + # python case "${CD_OS_ID}" in - "${CD_OS_ALMA}") + "${CD_OS_ALMA}"|"${CD_OS_ROCKY}") CD_PYTHON_COMMAND="python3.11" CD_PYTHON_PACKAGE="python3.11" CD_PYTHON_PACKAGES="/usr/lib64/python3.11/site-packages" @@ -218,6 +218,14 @@ Dir::Etc::SourceParts \"\"; CD_PYTHON_PACKAGE="python3" CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages" ;; + "${CD_OS_UBUNTU}") + case "${CD_OS_VERSION}" in + "noble") CD_PYTHON_COMMAND="python3.12" ;; + "mantic") CD_PYTHON_COMMAND="python3.11" ;; + esac + CD_PYTHON_PACKAGE="python3" + CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages" + ;; esac cd_split cd_echo "CD_PYTHON_COMMAND" "CD_PYTHON_PACKAGE" "CD_PYTHON_PACKAGES" From 2ac9ad2ff2c5511ebeb257fb46ec50c5e612edbf Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 20:38:46 +0200 Subject: [PATCH 21/28] duplicate --- cd.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cd.sh b/cd.sh index fd72456..2f0e66f 100644 --- a/cd.sh +++ b/cd.sh @@ -385,10 +385,8 @@ cd_update_ca_certificates () { } cd_set_https_verification_on () { - if [ "${CD_CA}" -o "${CD_OS_ID}" = "${CD_OS_DEBIAN}" ] ; then - cd_step "Set HTTPS verification on" - cd_rm "${CD_PM_HTTPS_PATH}" - fi + cd_step "Set HTTPS verification on" + cd_rm "${CD_PM_HTTPS_PATH}" } cd_upgrade_packages () { From cea770999857fc49396f1024446e060f3865eb64 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 21:34:10 +0200 Subject: [PATCH 22/28] sed/cat --- cd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cd.sh b/cd.sh index 2f0e66f..fac2b70 100644 --- a/cd.sh +++ b/cd.sh @@ -292,7 +292,6 @@ local file "|^mirrorlist|# mirrorlist|" \ "|${CD_DEFAULT_REPO_ALMA}|${CD_OS_REPO}|" \ "|^# baseurl|baseurl|" - cd_cat "${file}" ;; "${CD_OS_ALPINE}") file="/etc/apk/repositories" @@ -544,6 +543,7 @@ local file for expression in "${@}" ; do sed --in-place "s${expression}g" "${file}" || exit done + cd_cat "${file}" fi } From 7c0908b120cafc83a72c087c0dd1901e2c431148 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 21:39:20 +0200 Subject: [PATCH 23/28] wip/todo --- cd.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cd.sh b/cd.sh index fac2b70..63aad9a 100644 --- a/cd.sh +++ b/cd.sh @@ -309,6 +309,11 @@ deb ${CD_OS_REPO} ${CD_OS_VERSION}-updates main deb ${CD_OS_REPO}-security ${CD_OS_VERSION}-security main " ;; + # TODO + "${CD_OS_ROCKY}") + ;; + "${CD_OS_UBUNTU}") + ;; esac } From 1b5ef403c704122f341865c58832ad25a9a981ed Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 22:20:41 +0200 Subject: [PATCH 24/28] wip/pkg --- cd.sh | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/cd.sh b/cd.sh index 63aad9a..500b144 100644 --- a/cd.sh +++ b/cd.sh @@ -114,6 +114,7 @@ cd_set_environment_variables () { CD_CMD_INSTALL="dnf install --assumeyes" CD_CMD_UPDATE="dnf makecache" CD_CMD_UPGRADE="dnf upgrade --assumeyes" + CD_PKG_PKG="" CD_PM_CONF_PATH="/etc/dnf/dnf.conf" CD_PM_CONF_TEXT="\ [main] @@ -131,6 +132,7 @@ skip_if_unavailable=False CD_CMD_INSTALL="apk add" CD_CMD_UPDATE="apk update" CD_CMD_UPGRADE="apk upgrade" + CD_PKG_PKG="" CD_PM_CONF_PATH="" CD_PM_CONF_TEXT="" CD_PM_HTTPS_PATH="/etc/apk/repositories.d/https" @@ -141,6 +143,7 @@ skip_if_unavailable=False CD_CMD_INSTALL="apt-get install --assume-yes" CD_CMD_UPDATE="apt-get update" CD_CMD_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="\ Acquire::Check-Valid-Until True; @@ -156,7 +159,7 @@ Dir::Etc::SourceParts \"\"; cd_split cd_echo "CD_CMD_CLEAN" "CD_CMD_INSTALL" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" cd_split - cd_echo "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH" + cd_echo "CD_PKG_PKG" "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH" # specific case "${CD_OS_ID}" in "${CD_OS_ALMA}") @@ -231,20 +234,10 @@ Dir::Etc::SourceParts \"\"; cd_echo "CD_PYTHON_COMMAND" "CD_PYTHON_PACKAGE" "CD_PYTHON_PACKAGES" # TODO case "${CD_OS_ID}" in - "${CD_OS_ALMA}") - CD_PKG_PKG="" - ;; - "${CD_OS_ALPINE}") - CD_PKG_PKG="" - ;; "${CD_OS_DEBIAN}") export DEBIAN_FRONTEND="noninteractive" - # - CD_PKG_PKG="apt-utils" ;; esac - cd_split - cd_echo "CD_PKG_PKG" # variables [ "${CD_CA_1}" ] && CD_CA=true # continuous integration platform From 1652a1545bf872fb6a2789ee3d7f13da465ab23e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 22:36:30 +0200 Subject: [PATCH 25/28] wip/pkgconf --- cd.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cd.sh b/cd.sh index 500b144..f61491a 100644 --- a/cd.sh +++ b/cd.sh @@ -14,9 +14,9 @@ rwx \ cd_main () { cd_set_environment_variables cd_set_packages_repositories + cd_set_packages_configuration # cd_list_working_directory - cd_set_packages_configuration cd_set_https_verification_off cd_set_dns_resolving cd_update_packages_catalog @@ -232,12 +232,6 @@ Dir::Etc::SourceParts \"\"; esac cd_split cd_echo "CD_PYTHON_COMMAND" "CD_PYTHON_PACKAGE" "CD_PYTHON_PACKAGES" - # TODO - case "${CD_OS_ID}" in - "${CD_OS_DEBIAN}") - export DEBIAN_FRONTEND="noninteractive" - ;; - esac # variables [ "${CD_CA_1}" ] && CD_CA=true # continuous integration platform @@ -310,6 +304,16 @@ deb ${CD_OS_REPO}-security ${CD_OS_VERSION}-security main esac } +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}") + export DEBIAN_FRONTEND="noninteractive" + ;; + esac +} + # agnostic steps cd_list_working_directory () { @@ -317,12 +321,8 @@ cd_list_working_directory () { cd_ls "." } -cd_set_packages_configuration () { - cd_step "Set packages configuration" - cd_write "${CD_PM_CONF_PATH}" "${CD_PM_CONF_TEXT}" -} - cd_set_https_verification_off () { + # TODO if [ "${CD_CA}" -o "${CD_OS_ID}" = "${CD_OS_DEBIAN}" ] ; then cd_step "Set HTTPS verification off" cd_mkdir "$(dirname "${CD_PM_HTTPS_PATH}")" From 8503de45557eb65b444f63532beb6404860ba6d6 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 22:51:23 +0200 Subject: [PATCH 26/28] wip/redhat --- cd.sh | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/cd.sh b/cd.sh index f61491a..7975e14 100644 --- a/cd.sh +++ b/cd.sh @@ -274,31 +274,42 @@ local file cd_step "Set packages repositories" case "${CD_OS_ID}" in "${CD_OS_ALMA}") - file="/etc/yum.repos.d/almalinux.repo" + case "${CD_OS_VERSION}" in + "8") file="/etc/yum.repos.d/almalinux.repo" ;; + "9") file="/etc/yum.repos.d/almalinux-baseos.repo" ;; + esac cd_sed "${file}" \ "|^mirrorlist|# mirrorlist|" \ - "|${CD_DEFAULT_REPO_ALMA}|${CD_OS_REPO}|" \ + "|${CD_DEFAULT_REPO_ALMA}|${CD_URL_CHOSEN}|" \ "|^# baseurl|baseurl|" ;; "${CD_OS_ALPINE}") file="/etc/apk/repositories" cd_write "${file}" "\ -${CD_OS_REPO}/v${CD_OS_VERSION}/main -${CD_OS_REPO}/v${CD_OS_VERSION}/community +${CD_URL_CHOSEN}/v${CD_OS_VERSION}/main +${CD_URL_CHOSEN}/v${CD_OS_VERSION}/community " ;; "${CD_OS_DEBIAN}") file="/etc/apt/sources.list" cd_write "${file}" "\ -deb ${CD_OS_REPO} ${CD_OS_VERSION} main -deb ${CD_OS_REPO} ${CD_OS_VERSION}-backports main -deb ${CD_OS_REPO} ${CD_OS_VERSION}-updates main -deb ${CD_OS_REPO}-security ${CD_OS_VERSION}-security main +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 " ;; - # TODO "${CD_OS_ROCKY}") + case "${CD_OS_VERSION}" in + "8") file="/etc/yum.repos.d/Rocky-BaseOS.repo" ;; + "9") file="/etc/yum.repos.d/rocky.repo" ;; + esac + cd_sed "${file}" \ + "|^mirrorlist|# mirrorlist|" \ + "|${CD_DEFAULT_REPO_ALMA}|${CD_URL_CHOSEN}|" \ + "|^#baseurl|baseurl|" ;; + # TODO "${CD_OS_UBUNTU}") ;; esac From 0f8834a050b2bcf2a5e06abe5b273a901a55be68 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 22:57:17 +0200 Subject: [PATCH 27/28] github --- cd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cd.sh b/cd.sh index 7975e14..9bc03b0 100644 --- a/cd.sh +++ b/cd.sh @@ -236,7 +236,7 @@ Dir::Etc::SourceParts \"\"; [ "${CD_CA_1}" ] && CD_CA=true # continuous integration platform if [ "${GITHUB_ACTIONS}" ] ; then - # forgejo / gitea / github + # github → gitea → forgejo CD_SERVER_URL="${GITHUB_SERVER_URL}" CD_PROJECTS_GROUP="$(dirname "${GITHUB_REPOSITORY}")" CD_PROJECT_NAME="$(basename "${GITHUB_REPOSITORY}")" From d92eac13fa4ea101f2a283ad6f947d8ff7b4b618 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 23:47:31 +0200 Subject: [PATCH 28/28] ubuntu --- cd.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cd.sh b/cd.sh index 9bc03b0..16a189c 100644 --- a/cd.sh +++ b/cd.sh @@ -309,8 +309,14 @@ deb ${CD_URL_CHOSEN}-security ${CD_OS_VERSION}-security main "|${CD_DEFAULT_REPO_ALMA}|${CD_URL_CHOSEN}|" \ "|^#baseurl|baseurl|" ;; - # TODO "${CD_OS_UBUNTU}") + file="/etc/apt/sources.list" + cd_write "${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 +" ;; esac }