Merge pull request #52 from hoesler/master

fix: make dist should put diff binaries in bin folder

Author: databus23

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

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"