From 6b76913f0cb726799a5d3212df4b47f79fcf21b9 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Wed, 15 Nov 2023 16:12:56 -0500 Subject: [PATCH 1/4] grant read to all on repo pubkey --- dist/dist-packages/linux/install.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/dist-packages/linux/install.bash b/dist/dist-packages/linux/install.bash index 5d65ea0c5..ef71296f5 100644 --- a/dist/dist-packages/linux/install.bash +++ b/dist/dist-packages/linux/install.bash @@ -97,7 +97,7 @@ installDebian(){ # always update the pubkey $GETTERCMD https://get.openziti.io/tun/package-repos.gpg \ | $GNUPGCMD --batch --yes --dearmor --output /usr/share/keyrings/openziti.gpg - chmod +r /usr/share/keyrings/openziti.gpg + chmod a+r /usr/share/keyrings/openziti.gpg local REPOSRC="deb [signed-by=/usr/share/keyrings/openziti.gpg] https://packages.openziti.org/${ZITIPAX_DEB:-zitipax-openziti-deb-stable} debian main" From f32aae1fa2fa6601277b38b2f9d22d556d57b59e Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Wed, 15 Nov 2023 22:18:13 -0500 Subject: [PATCH 2/4] catch missing deps --- dist/dist-packages/linux/install.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/dist-packages/linux/install.bash b/dist/dist-packages/linux/install.bash index ef71296f5..5d6888533 100644 --- a/dist/dist-packages/linux/install.bash +++ b/dist/dist-packages/linux/install.bash @@ -11,7 +11,7 @@ checkSum() { break fi done - if [ -z "$SUMCMD" ]; then + if [ -z "${SUMCMD:-}" ]; then echo "ERROR: No checksum command found. Tried 'sha256sum', 'md5sum'." >&2 exit 1 fi @@ -26,7 +26,7 @@ installRedHat(){ break fi done - if [ -z "$PACKAGER" ]; then + if [ -z "${PACKAGER:-}" ]; then echo "ERROR: No package manager found. Tried 'dnf', 'yum'." >&2 exit 1 fi @@ -70,7 +70,7 @@ installDebian(){ break fi done - if [ -z "$GNUPGCMD" ]; then + if [ -z "${GNUPGCMD:-}" ]; then echo "ERROR: No GnuPG CLI found. Tried 'gpg', gpg2." >&2 exit 1 fi @@ -80,7 +80,7 @@ installDebian(){ break fi done - if [ -z "$GETTER" ]; then + if [ -z "${GETTER:-}" ]; then echo "ERROR: No http client found. Tried 'wget', 'curl'." >&2 exit 1 else From d368a98c435e215ed9dafa723a758a0dc0b11e51 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Thu, 16 Nov 2023 13:03:41 -0500 Subject: [PATCH 3/4] test ziti-ci --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c6acaec43..c2d66686e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,7 +49,7 @@ jobs: go-version: '1.20.x' - name: Install Ziti CI - uses: openziti/ziti-ci@v1 + uses: openziti/ziti-ci@ignore-prerelease-versions - name: Build and Test shell: bash From 408f50fbcdb67fc2d5fe3d20b7369ece6d7b8eb8 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Thu, 16 Nov 2023 13:26:15 -0500 Subject: [PATCH 4/4] Revert "test ziti-ci" This reverts commit d368a98c435e215ed9dafa723a758a0dc0b11e51. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c2d66686e..c6acaec43 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,7 +49,7 @@ jobs: go-version: '1.20.x' - name: Install Ziti CI - uses: openziti/ziti-ci@ignore-prerelease-versions + uses: openziti/ziti-ci@v1 - name: Build and Test shell: bash