diff --git a/.forgejo/workflows/almalinux_8.yaml b/.forgejo/workflows/almalinux_8.yaml index 87a0f55..98d5c0d 100644 --- a/.forgejo/workflows/almalinux_8.yaml +++ b/.forgejo/workflows/almalinux_8.yaml @@ -5,9 +5,6 @@ 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 5e1d9a6..9355241 100644 --- a/.forgejo/workflows/almalinux_9.yaml +++ b/.forgejo/workflows/almalinux_9.yaml @@ -5,9 +5,6 @@ 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 0ef9a45..0a1fd7f 100644 --- a/.forgejo/workflows/alpine_3.18.yaml +++ b/.forgejo/workflows/alpine_3.18.yaml @@ -5,9 +5,6 @@ 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 2aabd01..6a736bc 100644 --- a/.forgejo/workflows/alpine_3.19.yaml +++ b/.forgejo/workflows/alpine_3.19.yaml @@ -5,9 +5,6 @@ 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 c39aa87..484465a 100644 --- a/.forgejo/workflows/archlinux_base-20231112.0.191179.yaml +++ b/.forgejo/workflows/archlinux_base-20231112.0.191179.yaml @@ -5,9 +5,6 @@ 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 ee468f6..3de46f0 100644 --- a/.forgejo/workflows/archlinux_base-20240101.0.204074.yaml +++ b/.forgejo/workflows/archlinux_base-20240101.0.204074.yaml @@ -5,9 +5,6 @@ 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 7e42f92..4bc47bc 100644 --- a/.forgejo/workflows/debian_bookworm.yaml +++ b/.forgejo/workflows/debian_bookworm.yaml @@ -5,9 +5,6 @@ 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 18a2b61..8d5289e 100644 --- a/.forgejo/workflows/debian_bullseye.yaml +++ b/.forgejo/workflows/debian_bullseye.yaml @@ -5,9 +5,6 @@ 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 5319b3d..9d55290 100644 --- a/.forgejo/workflows/fedora_39.yaml +++ b/.forgejo/workflows/fedora_39.yaml @@ -5,9 +5,6 @@ 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 cdae53b..5eda681 100644 --- a/.forgejo/workflows/fedora_40.yaml +++ b/.forgejo/workflows/fedora_40.yaml @@ -5,9 +5,6 @@ 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 cccbda1..7909b85 100644 --- a/.forgejo/workflows/rockylinux_8.yaml +++ b/.forgejo/workflows/rockylinux_8.yaml @@ -5,9 +5,6 @@ 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 6d65181..201e082 100644 --- a/.forgejo/workflows/rockylinux_9.yaml +++ b/.forgejo/workflows/rockylinux_9.yaml @@ -5,9 +5,6 @@ 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 a33464a..0b57630 100644 --- a/.forgejo/workflows/ubuntu_jammy.yaml +++ b/.forgejo/workflows/ubuntu_jammy.yaml @@ -5,9 +5,6 @@ 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 96aaad0..58950cc 100644 --- a/.forgejo/workflows/ubuntu_noble.yaml +++ b/.forgejo/workflows/ubuntu_noble.yaml @@ -5,9 +5,6 @@ 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 6018dd8..9790b19 100644 --- a/.github/workflows/debian:bookworm.yaml +++ b/.github/workflows/debian:bookworm.yaml @@ -6,9 +6,6 @@ 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}}" diff --git a/pidd.sh b/pidd.sh index cfbc60b..7410232 100644 --- a/pidd.sh +++ b/pidd.sh @@ -9,13 +9,12 @@ # 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 @@ -353,11 +352,12 @@ 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="${PIDD_PROJECT_ROOT}${GITHUB_TOKEN}@" + PIDD_PROJECT_ROOT="$(dirname "${GITHUB_SERVER_URL}")\ +//${GITHUB_TOKEN}@$(basename "${GITHUB_SERVER_URL}")" + else + pidd_error_ci "GITHUB_TOKEN" fi - PIDD_PROJECT_ROOT="${PIDD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")" else pidd_error_ci "GITHUB_SERVER_URL" fi @@ -618,13 +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_install_python_modules__url="\ +${PIDD_PROJECT_ROOT}/${PIDD_PROJECT_PATH}/${pidd_install_python_modules__repository}" pidd_split echo "\ ${pidd_install_python_modules__url} @@ -632,12 +632,12 @@ ${pidd_install_python_modules__url} git clone \ "${pidd_install_python_modules__url}" \ "${pidd_install_python_modules__root}\ -/${pidd_install_python_modules__name}" \ +/${pidd_install_python_modules__repository}" \ || exit pidd_install_python_modules__path="\ ${pidd_install_python_modules__root}\ -/${pidd_install_python_modules__name}\ -/${pidd_install_python_modules__name}" +/${pidd_install_python_modules__repository}\ +/${pidd_install_python_modules__repository}" echo "\ ${pidd_install_python_modules__path} ↓ diff --git a/pidd/__init__.py b/pidd/__init__.py index 20a3de7..deda9af 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" #