From 023a580f00b4f9b9f6efa98d8af91dd71e26fcb3 Mon Sep 17 00:00:00 2001 From: Mike Borozdin Date: Tue, 17 Aug 2021 15:58:08 -0700 Subject: [PATCH] support for darwin and linux (#4122) * support for darwin and linux * updated to use go for env variables --- Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 95e34acdb..301fdda14 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,8 @@ # Makefile for kustomize CLI and API. SHELL := /usr/bin/env bash +GOOS = $(shell go env GOOS) +GOARCH = $(shell go env GOARCH) MYGOBIN = $(shell go env GOBIN) ifeq ($(MYGOBIN),) MYGOBIN = $(shell go env GOPATH)/bin @@ -289,8 +291,8 @@ $(MYGOBIN)/kubeval: ( \ set -e; \ d=$(shell mktemp -d); cd $$d; \ - wget https://github.com/instrumenta/kubeval/releases/latest/download/kubeval-linux-amd64.tar.gz; \ - tar xf kubeval-linux-amd64.tar.gz; \ + wget https://github.com/instrumenta/kubeval/releases/latest/download/kubeval-$(GOOS)-$(GOARCH).tar.gz; \ + tar xf kubeval-$(GOOS)-$(GOARCH).tar.gz; \ mv kubeval $(MYGOBIN); \ rm -rf $$d; \ ) @@ -304,10 +306,10 @@ $(MYGOBIN)/helmV2: ( \ set -e; \ d=$(shell mktemp -d); cd $$d; \ - tgzFile=helm-v2.13.1-linux-amd64.tar.gz; \ + tgzFile=helm-v2.13.1-$(GOOS)-$(GOARCH).tar.gz; \ wget https://storage.googleapis.com/kubernetes-helm/$$tgzFile; \ tar -xvzf $$tgzFile; \ - mv linux-amd64/helm $(MYGOBIN)/helmV2; \ + mv $(GOOS)-$(GOARCH)/helm $(MYGOBIN)/helmV2; \ rm -rf $$d \ ) @@ -317,10 +319,10 @@ $(MYGOBIN)/helmV3: ( \ set -e; \ d=$(shell mktemp -d); cd $$d; \ - tgzFile=helm-v3.5.3-linux-amd64.tar.gz; \ + tgzFile=helm-v3.5.3-$(GOOS)-$(GOARCH).tar.gz; \ wget https://get.helm.sh/$$tgzFile; \ tar -xvzf $$tgzFile; \ - mv linux-amd64/helm $(MYGOBIN)/helmV3; \ + mv $(GOOS)-$(GOARCH)/helm $(MYGOBIN)/helmV3; \ rm -rf $$d \ ) @@ -328,7 +330,7 @@ $(MYGOBIN)/kind: ( \ set -e; \ d=$(shell mktemp -d); cd $$d; \ - wget -O ./kind https://github.com/kubernetes-sigs/kind/releases/download/v0.7.0/kind-$(shell uname)-amd64; \ + wget -O ./kind https://github.com/kubernetes-sigs/kind/releases/download/v0.7.0/kind-$(GOOS)-$(GOARCH); \ chmod +x ./kind; \ mv ./kind $(MYGOBIN); \ rm -rf $$d; \ @@ -339,10 +341,10 @@ $(MYGOBIN)/gh: ( \ set -e; \ d=$(shell mktemp -d); cd $$d; \ - tgzFile=gh_1.0.0_linux_amd64.tar.gz; \ + tgzFile=gh_1.0.0_$(GOOS)_$(GOARCH).tar.gz; \ wget https://github.com/cli/cli/releases/download/v1.0.0/$$tgzFile; \ tar -xvzf $$tgzFile; \ - mv gh_1.0.0_linux_amd64/bin/gh $(MYGOBIN)/gh; \ + mv gh_1.0.0_$(GOOS)_$(GOARCH)/bin/gh $(MYGOBIN)/gh; \ rm -rf $$d \ )