From b7742c9a13a138a84e4b2c3f63dad7376b63cb9d Mon Sep 17 00:00:00 2001
From: Martin De Luca <mdeluca@cuebiq.com>
Date: Tue, 14 Sep 2021 20:52:27 +0200
Subject: [PATCH 1/2] fixed install-binary.sh script + linting of some go code.

---
 diff/diff.go      |  2 +-
 install-binary.sh | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/diff/diff.go b/diff/diff.go
index bce80e86..c8175d6a 100644
--- a/diff/diff.go
+++ b/diff/diff.go
@@ -148,7 +148,7 @@ func Releases(oldIndex, newIndex map[string]*manifest.MappingResult, suppressedK
 	return Manifests(oldIndex, newIndex, suppressedKinds, showSecrets, context, output, stripTrailingCR, to)
 }
 
-func diffMappingResults(oldContent *manifest.MappingResult, newContent *manifest.MappingResult, stripTrailingCR bool ) []difflib.DiffRecord {
+func diffMappingResults(oldContent *manifest.MappingResult, newContent *manifest.MappingResult, stripTrailingCR bool) []difflib.DiffRecord {
 	return diffStrings(oldContent.Content, newContent.Content, stripTrailingCR)
 }
 
diff --git a/install-binary.sh b/install-binary.sh
index 7fb33382..d22f95a2 100755
--- a/install-binary.sh
+++ b/install-binary.sh
@@ -6,9 +6,16 @@ PROJECT_NAME="helm-diff"
 PROJECT_GH="databus23/$PROJECT_NAME"
 export GREP_COLOR="never"
 
+[ -z "$HELM_BIN" ] && HELM_BIN=$(which helm)
+
 HELM_MAJOR_VERSION=$("${HELM_BIN}" version --client --short | awk -F '.' '{print $1}')
 
-: ${HELM_PLUGIN_DIR:="$("${HELM_BIN}" home --debug=false)/plugins/helm-diff"}
+HELM_HOME=$("${HELM_BIN}" home --debug=false)
+[ -z "$HELM_HOME" ] && HELM_HOME="$HOME/.helm"
+
+mkdir -p "$HELM_HOME"
+
+: ${HELM_PLUGIN_DIR:="$HELM_HOME/plugins/helm-diff"}
 
 # Convert the HELM_PLUGIN_DIR to unix if cygpath is
 # available. This is the case when using MSYS2 or Cygwin
@@ -100,7 +107,7 @@ downloadFile() {
 installFile() {
   HELM_TMP="/tmp/$PROJECT_NAME"
   mkdir -p "$HELM_TMP"
-  tar xf "$PLUGIN_TMP_FILE" -C "$HELM_TMP"
+  tar xvzf "$PLUGIN_TMP_FILE" -C "$HELM_TMP"
   HELM_TMP_BIN="$HELM_TMP/diff/bin/diff"
   echo "Preparing to install into ${HELM_PLUGIN_DIR}"
   mkdir -p "$HELM_PLUGIN_DIR/bin"

From 885d71d2259a4766602efb1ecf6565914a6f1a57 Mon Sep 17 00:00:00 2001
From: Martin De Luca <mdeluca@cuebiq.com>
Date: Tue, 14 Sep 2021 23:57:52 +0200
Subject: [PATCH 2/2] correct HELM_HOME

---
 install-binary.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/install-binary.sh b/install-binary.sh
index d22f95a2..bf7ac427 100755
--- a/install-binary.sh
+++ b/install-binary.sh
@@ -7,11 +7,10 @@ PROJECT_GH="databus23/$PROJECT_NAME"
 export GREP_COLOR="never"
 
 [ -z "$HELM_BIN" ] && HELM_BIN=$(which helm)
-
 HELM_MAJOR_VERSION=$("${HELM_BIN}" version --client --short | awk -F '.' '{print $1}')
 
 HELM_HOME=$("${HELM_BIN}" home --debug=false)
-[ -z "$HELM_HOME" ] && HELM_HOME="$HOME/.helm"
+[ -z "$HELM_HOME" ] && HELM_HOME=$(helm env | grep 'HELM_DATA_HOME' | cut -d '=' -f2 | tr -d '"')
 
 mkdir -p "$HELM_HOME"