From 58324e37a5681ceddd4e14264472a73ae037e75f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 23 Jun 2024 22:53:19 +0200 Subject: [PATCH 1/6] upfront --- pidd.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pidd.sh b/pidd.sh index 7410232..abfae3d 100644 --- a/pidd.sh +++ b/pidd.sh @@ -9,12 +9,13 @@ # main pidd_main () { + pidd_list_environment_variables + pidd_list_working_directory + # pidd_set_environment_variables 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 pidd_update_packages_catalog From b2db44b58b2b7c4fbe468d55b85be5a747715809 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 23 Jun 2024 22:58:57 +0200 Subject: [PATCH 2/6] =?UTF-8?q?=E2=88=92fixed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pidd.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/pidd.sh b/pidd.sh index abfae3d..5e705a8 100644 --- a/pidd.sh +++ b/pidd.sh @@ -624,8 +624,6 @@ ${PIDD_PROJECT_ROOT}${pidd_install_python_modules__repository}" ;; *) pidd_install_python_modules__url="\ ${PIDD_PROJECT_ROOT}/${PIDD_PROJECT_PATH}/${pidd_install_python_modules__repository}" ;; esac - pidd_install_python_modules__url="\ -${PIDD_PROJECT_ROOT}/${PIDD_PROJECT_PATH}/${pidd_install_python_modules__repository}" pidd_split echo "\ ${pidd_install_python_modules__url} From 1f18d97709abd99ed8ca6c57bf2f3b7ba5162d5d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 23 Jun 2024 23:11:51 +0200 Subject: [PATCH 3/6] github/token --- pidd.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pidd.sh b/pidd.sh index 5e705a8..aa98d43 100644 --- a/pidd.sh +++ b/pidd.sh @@ -353,12 +353,11 @@ Acquire::https::Verify-Peer False; if [ -n "${GITHUB_ACTIONS}" ] ; then # github → gitea → forgejo if [ -n "${GITHUB_SERVER_URL}" ] ; then + PIDD_PROJECT_ROOT="$(dirname "${GITHUB_SERVER_URL}")//" if [ -n "${GITHUB_TOKEN}" ] ; then - PIDD_PROJECT_ROOT="$(dirname "${GITHUB_SERVER_URL}")\ -//${GITHUB_TOKEN}@$(basename "${GITHUB_SERVER_URL}")" - else - pidd_error_ci "GITHUB_TOKEN" + PIDD_PROJECT_ROOT="${PIDD_PROJECT_ROOT}${GITHUB_TOKEN}@" fi + PIDD_PROJECT_ROOT="${PIDD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")" else pidd_error_ci "GITHUB_SERVER_URL" fi From 5eaa285252512e705737fd5b8d20810b83671648 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 23 Jun 2024 23:44:26 +0200 Subject: [PATCH 4/6] git/names --- pidd.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pidd.sh b/pidd.sh index aa98d43..cfbc60b 100644 --- a/pidd.sh +++ b/pidd.sh @@ -618,11 +618,13 @@ pidd_install_python_modules () { case "${pidd_install_python_modules__repository}" in http*) pidd_install_python_modules__url="\ ${pidd_install_python_modules__repository}" ;; - /*) pidd_install_python_modules__url="\ -${PIDD_PROJECT_ROOT}${pidd_install_python_modules__repository}" ;; - *) pidd_install_python_modules__url="\ -${PIDD_PROJECT_ROOT}/${PIDD_PROJECT_PATH}/${pidd_install_python_modules__repository}" ;; + /*) pidd_install_python_modules__url="${PIDD_PROJECT_ROOT}\ +${pidd_install_python_modules__repository}" ;; + *) pidd_install_python_modules__url="${PIDD_PROJECT_ROOT}\ +/${PIDD_PROJECT_PATH}/${pidd_install_python_modules__repository}" ;; esac + pidd_install_python_modules__name="\ +$(basename "${pidd_install_python_modules__url}")" pidd_split echo "\ ${pidd_install_python_modules__url} @@ -630,12 +632,12 @@ ${pidd_install_python_modules__url} git clone \ "${pidd_install_python_modules__url}" \ "${pidd_install_python_modules__root}\ -/${pidd_install_python_modules__repository}" \ +/${pidd_install_python_modules__name}" \ || exit pidd_install_python_modules__path="\ ${pidd_install_python_modules__root}\ -/${pidd_install_python_modules__repository}\ -/${pidd_install_python_modules__repository}" +/${pidd_install_python_modules__name}\ +/${pidd_install_python_modules__name}" echo "\ ${pidd_install_python_modules__path} ↓ From 175a9cc0a18461a00ea94f1e9442efb79db70ecf Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 23 Jun 2024 23:47:45 +0200 Subject: [PATCH 5/6] workflows --- .forgejo/workflows/almalinux_8.yaml | 3 +++ .forgejo/workflows/almalinux_9.yaml | 3 +++ .forgejo/workflows/alpine_3.18.yaml | 3 +++ .forgejo/workflows/alpine_3.19.yaml | 3 +++ .forgejo/workflows/archlinux_base-20231112.0.191179.yaml | 3 +++ .forgejo/workflows/archlinux_base-20240101.0.204074.yaml | 3 +++ .forgejo/workflows/debian_bookworm.yaml | 3 +++ .forgejo/workflows/debian_bullseye.yaml | 3 +++ .forgejo/workflows/fedora_39.yaml | 3 +++ .forgejo/workflows/fedora_40.yaml | 3 +++ .forgejo/workflows/rockylinux_8.yaml | 3 +++ .forgejo/workflows/rockylinux_9.yaml | 3 +++ .forgejo/workflows/ubuntu_jammy.yaml | 3 +++ .forgejo/workflows/ubuntu_noble.yaml | 3 +++ .github/workflows/debian:bookworm.yaml | 3 +++ 15 files changed, 45 insertions(+) diff --git a/.forgejo/workflows/almalinux_8.yaml b/.forgejo/workflows/almalinux_8.yaml index 98d5c0d..87a0f55 100644 --- a/.forgejo/workflows/almalinux_8.yaml +++ b/.forgejo/workflows/almalinux_8.yaml @@ -5,6 +5,9 @@ jobs: image: almalinux:8 steps: - name: pidd + env: + PIDD_GIT_MAIN: ${{vars.PIDD_GIT_MAIN}} + PIDD_GIT_ROOT: ${{vars.PIDD_GIT_ROOT}} run: > ${{vars.PIDD}} "${{secrets.PIDD_SSH_KEY}}" diff --git a/.forgejo/workflows/almalinux_9.yaml b/.forgejo/workflows/almalinux_9.yaml index 9355241..5e1d9a6 100644 --- a/.forgejo/workflows/almalinux_9.yaml +++ b/.forgejo/workflows/almalinux_9.yaml @@ -5,6 +5,9 @@ jobs: image: almalinux:9 steps: - name: pidd + env: + PIDD_GIT_MAIN: ${{vars.PIDD_GIT_MAIN}} + PIDD_GIT_ROOT: ${{vars.PIDD_GIT_ROOT}} run: > ${{vars.PIDD}} "${{secrets.PIDD_SSH_KEY}}" diff --git a/.forgejo/workflows/alpine_3.18.yaml b/.forgejo/workflows/alpine_3.18.yaml index 0a1fd7f..0ef9a45 100644 --- a/.forgejo/workflows/alpine_3.18.yaml +++ b/.forgejo/workflows/alpine_3.18.yaml @@ -5,6 +5,9 @@ jobs: image: alpine:3.18 steps: - name: pidd + env: + PIDD_GIT_MAIN: ${{vars.PIDD_GIT_MAIN}} + PIDD_GIT_ROOT: ${{vars.PIDD_GIT_ROOT}} run: > ${{vars.PIDD}} "${{secrets.PIDD_SSH_KEY}}" diff --git a/.forgejo/workflows/alpine_3.19.yaml b/.forgejo/workflows/alpine_3.19.yaml index 6a736bc..2aabd01 100644 --- a/.forgejo/workflows/alpine_3.19.yaml +++ b/.forgejo/workflows/alpine_3.19.yaml @@ -5,6 +5,9 @@ jobs: image: alpine:3.19 steps: - name: pidd + env: + PIDD_GIT_MAIN: ${{vars.PIDD_GIT_MAIN}} + PIDD_GIT_ROOT: ${{vars.PIDD_GIT_ROOT}} run: > ${{vars.PIDD}} "${{secrets.PIDD_SSH_KEY}}" diff --git a/.forgejo/workflows/archlinux_base-20231112.0.191179.yaml b/.forgejo/workflows/archlinux_base-20231112.0.191179.yaml index 484465a..c39aa87 100644 --- a/.forgejo/workflows/archlinux_base-20231112.0.191179.yaml +++ b/.forgejo/workflows/archlinux_base-20231112.0.191179.yaml @@ -5,6 +5,9 @@ jobs: image: archlinux:base-20231112.0.191179 steps: - name: pidd + env: + PIDD_GIT_MAIN: ${{vars.PIDD_GIT_MAIN}} + PIDD_GIT_ROOT: ${{vars.PIDD_GIT_ROOT}} run: > ${{vars.PIDD}} "${{secrets.PIDD_SSH_KEY}}" diff --git a/.forgejo/workflows/archlinux_base-20240101.0.204074.yaml b/.forgejo/workflows/archlinux_base-20240101.0.204074.yaml index 3de46f0..ee468f6 100644 --- a/.forgejo/workflows/archlinux_base-20240101.0.204074.yaml +++ b/.forgejo/workflows/archlinux_base-20240101.0.204074.yaml @@ -5,6 +5,9 @@ jobs: image: archlinux:base-20240101.0.204074 steps: - name: pidd + env: + PIDD_GIT_MAIN: ${{vars.PIDD_GIT_MAIN}} + PIDD_GIT_ROOT: ${{vars.PIDD_GIT_ROOT}} run: > ${{vars.PIDD}} "${{secrets.PIDD_SSH_KEY}}" diff --git a/.forgejo/workflows/debian_bookworm.yaml b/.forgejo/workflows/debian_bookworm.yaml index 4bc47bc..7e42f92 100644 --- a/.forgejo/workflows/debian_bookworm.yaml +++ b/.forgejo/workflows/debian_bookworm.yaml @@ -5,6 +5,9 @@ jobs: image: debian:bookworm steps: - name: pidd + env: + PIDD_GIT_MAIN: ${{vars.PIDD_GIT_MAIN}} + PIDD_GIT_ROOT: ${{vars.PIDD_GIT_ROOT}} run: > ${{vars.PIDD}} "${{secrets.PIDD_SSH_KEY}}" diff --git a/.forgejo/workflows/debian_bullseye.yaml b/.forgejo/workflows/debian_bullseye.yaml index 8d5289e..18a2b61 100644 --- a/.forgejo/workflows/debian_bullseye.yaml +++ b/.forgejo/workflows/debian_bullseye.yaml @@ -5,6 +5,9 @@ jobs: image: debian:bullseye steps: - name: pidd + env: + PIDD_GIT_MAIN: ${{vars.PIDD_GIT_MAIN}} + PIDD_GIT_ROOT: ${{vars.PIDD_GIT_ROOT}} run: > ${{vars.PIDD}} "${{secrets.PIDD_SSH_KEY}}" diff --git a/.forgejo/workflows/fedora_39.yaml b/.forgejo/workflows/fedora_39.yaml index 9d55290..5319b3d 100644 --- a/.forgejo/workflows/fedora_39.yaml +++ b/.forgejo/workflows/fedora_39.yaml @@ -5,6 +5,9 @@ jobs: image: fedora:39 steps: - name: pidd + env: + PIDD_GIT_MAIN: ${{vars.PIDD_GIT_MAIN}} + PIDD_GIT_ROOT: ${{vars.PIDD_GIT_ROOT}} run: > ${{vars.PIDD}} "${{secrets.PIDD_SSH_KEY}}" diff --git a/.forgejo/workflows/fedora_40.yaml b/.forgejo/workflows/fedora_40.yaml index 5eda681..cdae53b 100644 --- a/.forgejo/workflows/fedora_40.yaml +++ b/.forgejo/workflows/fedora_40.yaml @@ -5,6 +5,9 @@ jobs: image: fedora:40 steps: - name: pidd + env: + PIDD_GIT_MAIN: ${{vars.PIDD_GIT_MAIN}} + PIDD_GIT_ROOT: ${{vars.PIDD_GIT_ROOT}} run: > ${{vars.PIDD}} "${{secrets.PIDD_SSH_KEY}}" diff --git a/.forgejo/workflows/rockylinux_8.yaml b/.forgejo/workflows/rockylinux_8.yaml index 7909b85..cccbda1 100644 --- a/.forgejo/workflows/rockylinux_8.yaml +++ b/.forgejo/workflows/rockylinux_8.yaml @@ -5,6 +5,9 @@ jobs: image: rockylinux:8 steps: - name: pidd + env: + PIDD_GIT_MAIN: ${{vars.PIDD_GIT_MAIN}} + PIDD_GIT_ROOT: ${{vars.PIDD_GIT_ROOT}} run: > ${{vars.PIDD}} "${{secrets.PIDD_SSH_KEY}}" diff --git a/.forgejo/workflows/rockylinux_9.yaml b/.forgejo/workflows/rockylinux_9.yaml index 201e082..6d65181 100644 --- a/.forgejo/workflows/rockylinux_9.yaml +++ b/.forgejo/workflows/rockylinux_9.yaml @@ -5,6 +5,9 @@ jobs: image: rockylinux:9 steps: - name: pidd + env: + PIDD_GIT_MAIN: ${{vars.PIDD_GIT_MAIN}} + PIDD_GIT_ROOT: ${{vars.PIDD_GIT_ROOT}} run: > ${{vars.PIDD}} "${{secrets.PIDD_SSH_KEY}}" diff --git a/.forgejo/workflows/ubuntu_jammy.yaml b/.forgejo/workflows/ubuntu_jammy.yaml index 0b57630..a33464a 100644 --- a/.forgejo/workflows/ubuntu_jammy.yaml +++ b/.forgejo/workflows/ubuntu_jammy.yaml @@ -5,6 +5,9 @@ jobs: image: ubuntu:jammy steps: - name: pidd + env: + PIDD_GIT_MAIN: ${{vars.PIDD_GIT_MAIN}} + PIDD_GIT_ROOT: ${{vars.PIDD_GIT_ROOT}} run: > ${{vars.PIDD}} "${{secrets.PIDD_SSH_KEY}}" diff --git a/.forgejo/workflows/ubuntu_noble.yaml b/.forgejo/workflows/ubuntu_noble.yaml index 58950cc..96aaad0 100644 --- a/.forgejo/workflows/ubuntu_noble.yaml +++ b/.forgejo/workflows/ubuntu_noble.yaml @@ -5,6 +5,9 @@ jobs: image: ubuntu:noble steps: - name: pidd + env: + PIDD_GIT_MAIN: ${{vars.PIDD_GIT_MAIN}} + PIDD_GIT_ROOT: ${{vars.PIDD_GIT_ROOT}} run: > ${{vars.PIDD}} "${{secrets.PIDD_SSH_KEY}}" diff --git a/.github/workflows/debian:bookworm.yaml b/.github/workflows/debian:bookworm.yaml index 9790b19..6018dd8 100644 --- a/.github/workflows/debian:bookworm.yaml +++ b/.github/workflows/debian:bookworm.yaml @@ -6,6 +6,9 @@ jobs: image: debian:bookworm steps: - name: pidd + env: + PIDD_GIT_MAIN: ${{vars.PIDD_GIT_MAIN}} + PIDD_GIT_ROOT: ${{vars.PIDD_GIT_ROOT}} run: > echo '${{vars.PIDD}}' | tr -d '\r' | sh -s "${{secrets.PIDD_SSH_KEY}}" From 5f0429befd42ae81481ef0617f89d1c6649392eb Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 24 Jun 2024 00:01:59 +0200 Subject: [PATCH 6/6] *arguments --- pidd/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pidd/__init__.py b/pidd/__init__.py index deda9af..20a3de7 100644 --- a/pidd/__init__.py +++ b/pidd/__init__.py @@ -125,7 +125,7 @@ def main(main: str) -> None: def set_ssh(*arguments: str) -> None: step("Set SSH") # - ssh_key, ssh_hosts = arguments + ssh_key, ssh_hosts = *arguments # ssh_type = "ed25519" #