Unverified Commit c6d4ffc2 authored by Christian Rebischke's avatar Christian Rebischke Committed by GitHub
Browse files

Merge pull request #61 from coderobe/patch-2

generic-ci: drop wget in favor of curl
parents 3346a2f1 1eeb5dad
...@@ -10,10 +10,10 @@ case $1 in ...@@ -10,10 +10,10 @@ case $1 in
PACKER_SHA256_SIG="https://releases.hashicorp.com/packer/$PACKER_CURRENT_VERSION/packer_${PACKER_CURRENT_VERSION}_SHA256SUMS.sig" PACKER_SHA256_SIG="https://releases.hashicorp.com/packer/$PACKER_CURRENT_VERSION/packer_${PACKER_CURRENT_VERSION}_SHA256SUMS.sig"
HASHICORP_FINGERPRINT=91a6e7f85d05c65630bef18951852d87348ffc4c HASHICORP_FINGERPRINT=91a6e7f85d05c65630bef18951852d87348ffc4c
HASHICORP_KEY="https://keybase.io/hashicorp/pgp_keys.asc?fingerprint=${HASHICORP_FINGERPRINT}" HASHICORP_KEY="https://keybase.io/hashicorp/pgp_keys.asc?fingerprint=${HASHICORP_FINGERPRINT}"
wget "${PACKER_URL}" curl -LO "${PACKER_URL}"
wget "${PACKER_SHA256}" curl -LO "${PACKER_SHA256}"
wget "${PACKER_SHA256_SIG}" curl -LO "${PACKER_SHA256_SIG}"
wget -O hashicorp.key "${HASHICORP_KEY}" wget -Lo hashicorp.key "${HASHICORP_KEY}"
gpg --with-fingerprint --with-colons hashicorp.key | grep ${HASHICORP_FINGERPRINT^^} gpg --with-fingerprint --with-colons hashicorp.key | grep ${HASHICORP_FINGERPRINT^^}
gpg --import hashicorp.key gpg --import hashicorp.key
gpg --verify "packer_${PACKER_CURRENT_VERSION}_SHA256SUMS.sig" "packer_${PACKER_CURRENT_VERSION}_SHA256SUMS" gpg --verify "packer_${PACKER_CURRENT_VERSION}_SHA256SUMS.sig" "packer_${PACKER_CURRENT_VERSION}_SHA256SUMS"
...@@ -24,7 +24,7 @@ case $1 in ...@@ -24,7 +24,7 @@ case $1 in
;; ;;
install-shfmt) install-shfmt)
curl -L https://github.com/mvdan/sh/releases/download/v2.6.4/shfmt_v2.6.4_linux_amd64 -o shfmt curl -Lo shfmt https://github.com/mvdan/sh/releases/download/v2.6.4/shfmt_v2.6.4_linux_amd64
chmod +x ./shfmt chmod +x ./shfmt
;; ;;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment