From e515239dac90a789bce3118cf5cdde271b1811c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20H=C3=B6sler?= Date: Wed, 16 May 2018 16:11:11 +0200 Subject: [PATCH 1/2] fix: make dist should put diff binaries in bin folder --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 3eddadc2..a3689be3 100644 --- a/Makefile +++ b/Makefile @@ -31,14 +31,14 @@ endif dist: export COPYFILE_DISABLE=1 #teach OSX tar to not put ._* files in tar archive dist: rm -rf build/diff/* release/* - mkdir -p build/diff release/ + mkdir -p build/diff/bin release/ cp README.md LICENSE plugin.yaml build/diff - GOOS=linux GOARCH=amd64 go build -o build/diff/diff -ldflags="$(LDFLAGS)" + GOOS=linux GOARCH=amd64 go build -o build/diff/bin/diff -ldflags="$(LDFLAGS)" tar -C build/ -zcvf $(CURDIR)/release/helm-diff-linux.tgz diff/ - GOOS=darwin GOARCH=amd64 go build -o build/diff/diff -ldflags="$(LDFLAGS)" + GOOS=darwin GOARCH=amd64 go build -o build/diff/bin/diff -ldflags="$(LDFLAGS)" tar -C build/ -zcvf $(CURDIR)/release/helm-diff-macos.tgz diff/ - rm build/diff/diff - GOOS=windows GOARCH=amd64 go build -o build/diff/diff.exe -ldflags="$(LDFLAGS)" + rm build/diff/bin/diff + GOOS=windows GOARCH=amd64 go build -o build/diff/bin/diff.exe -ldflags="$(LDFLAGS)" tar -C build/ -zcvf $(CURDIR)/release/helm-diff-windows.tgz diff/ .PHONY: release From e22918150f802c4e3ae783762354587f0174b089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20H=C3=B6sler?= Date: Tue, 5 Jun 2018 08:50:11 +0200 Subject: [PATCH 2/2] fix: update path to binary in install-binary.sh --- install-binary.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-binary.sh b/install-binary.sh index 638beeca..1e28de2e 100755 --- a/install-binary.sh +++ b/install-binary.sh @@ -97,7 +97,7 @@ installFile() { HELM_TMP="/tmp/$PROJECT_NAME" mkdir -p "$HELM_TMP" tar xf "$PLUGIN_TMP_FILE" -C "$HELM_TMP" - HELM_TMP_BIN="$HELM_TMP/diff/diff" + HELM_TMP_BIN="$HELM_TMP/diff/bin/diff" echo "Preparing to install into ${HELM_PLUGIN_PATH}" mkdir -p "$HELM_PLUGIN_PATH/bin" cp "$HELM_TMP_BIN" "$HELM_PLUGIN_PATH/bin"