Fix path (#55)

cloudposse · May 2, 2018 · 98b8dc8 · 98b8dc8
1 parent 29b17f4
commit 98b8dc8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,7 @@
 export BUILD_HARNESS_PATH ?= $(shell 'pwd')
 export OS ?= $(shell uname -s | tr '[:upper:]' '[:lower:]')
 export SELF ?= make
+export PATH := $(BUILD_HARNESS_PATH)/vendor:$(PATH)
 
 # Import Makefiles into current context
 include $(BUILD_HARNESS_PATH)/Makefile.*

diff --git a/modules/chamber/Makefile b/modules/chamber/Makefile
@@ -1,6 +1,6 @@
-CURL := $(shell which curl)
+CURL ?= curl
 CHAMBER_VERSION ?= 2.0.0
-CHAMBER := $(shell which chamber)
+CHAMBER ?= chamber
 
 ## Install chamber
 chamber/install: packages/install/chamber

diff --git a/modules/helm/Makefile b/modules/helm/Makefile
@@ -1,17 +1,16 @@
-CURL := $(shell which curl)
+CURL ?= curl
 export HELM_VERSION ?= 2.9.0
 HELM_PLATFORM ?= $(OS)-amd64
-HELM := $(shell which helm)
+HELM ?= helm
 HELM_HOME ?= $(HOME)/.helm
-
 HELM_REPO_PATH ?= ./$(REPO_NAME)
 HELM_PACKAGE_PATH ?= ./packages/$(REPO_NAME)
 
 ## Install helm
 helm/install: packages/install/helm packages/install/yq
-	@helm init --client-only
+	@$(HELM) init --client-only
 	@chmod -R 777 "$(HELM_HOME)"
-	@helm repo remove local || true
+	@$(HELM) repo remove local || true
 
 ## Build index for serve helm charts
 helm/serve/index:

diff --git a/modules/helmfile/Makefile b/modules/helmfile/Makefile
@@ -1,6 +1,6 @@
-CURL := $(shell which curl)
+CURL ?= curl
 HELMFILE_VERSION ?= 0.12.0
-HELMFILE := $(shell which helm)
+HELMFILE ?= helmfile
 
 ## Install helmfile
 helmfile/install: packages/install/helmfile packages/install/kubectl packages/install/helm