From 16715526d05ba187d54cc06bc3f4e24ab0fd4580 Mon Sep 17 00:00:00 2001
From: Anton Bretting <Sajfer@gmail.com>
Date: Sun, 9 Jan 2022 11:54:53 +0100
Subject: [PATCH 1/2] Fix for build image

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index fda76eb7..d328b3d4 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ docker-run-release: export pkg=/go/src/github.com/databus23/helm-diff
 docker-run-release:
 	git checkout master
 	git push
-	docker run -it --rm -e GITHUB_TOKEN -v $(shell pwd):$(pkg) -w $(pkg) golang:1.7.5 make bootstrap release
+	docker run -it --rm -e GITHUB_TOKEN -v $(shell pwd):$(pkg) -w $(pkg) golang:1.17.5 make bootstrap release
 
 .PHONY: dist
 dist: export COPYFILE_DISABLE=1 #teach OSX tar to not put ._* files in tar archive

From 2bbcd7a6a7793529fc75d435555f54ab8351b778 Mon Sep 17 00:00:00 2001
From: Anton Bretting <anton.bretting@ericsson.com>
Date: Tue, 11 Jan 2022 09:27:47 +0100
Subject: [PATCH 2/2] fix_lint_errors Lint fixes in install-binary.sh

---
 install-binary.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/install-binary.sh b/install-binary.sh
index 3a9e5f98..2ac14810 100755
--- a/install-binary.sh
+++ b/install-binary.sh
@@ -11,19 +11,18 @@ export GREP_COLOR="never"
 # on Windows where helm returns a Windows path but we
 # need a Unix path
 
-if type cygpath >/dev/null 2>&1; then
+if command -v cygpath >/dev/null 2>&1; then
   HELM_BIN="$(cygpath -u "${HELM_BIN}")"
   HELM_PLUGIN_DIR="$(cygpath -u "${HELM_PLUGIN_DIR}")"
 fi
 
 [ -z "$HELM_BIN" ] && HELM_BIN=$(command -v helm)
-HELM_MAJOR_VERSION=$("${HELM_BIN}" version --client --short | awk -F '.' '{print $1}')
 
 [ -z "$HELM_HOME" ] && HELM_HOME=$(helm env | grep 'HELM_DATA_HOME' | cut -d '=' -f2 | tr -d '"')
 
 mkdir -p "$HELM_HOME"
 
-: ${HELM_PLUGIN_DIR:="$HELM_HOME/plugins/helm-diff"}
+: "${HELM_PLUGIN_DIR:="$HELM_HOME/plugins/helm-diff"}"
 
 if [ "$SKIP_BIN_INSTALL" = "1" ]; then
   echo "Skipping binary install"
@@ -73,7 +72,9 @@ verifySupported() {
     exit 1
   fi
 
-  if ! type "curl" >/dev/null && ! type "wget" >/dev/null; then
+  if
+    ! command -v curl >/dev/null 2>&1 && ! command -v wget >/dev/null 2>&1
+  then
     echo "Either curl or wget is required"
     exit 1
   fi
@@ -82,7 +83,7 @@ verifySupported() {
 # getDownloadURL checks the latest available version.
 getDownloadURL() {
   version=$(git -C "$HELM_PLUGIN_DIR" describe --tags --exact-match 2>/dev/null || :)
-  if [ "$SCRIPT_MODE" = "install" -a -n "$version" ]; then
+  if [ "$SCRIPT_MODE" = "install" ] && [ -n "$version" ]; then
     DOWNLOAD_URL="https://github.com/$PROJECT_GH/releases/download/$version/helm-diff-$OS-$ARCH.tgz"
   else
     DOWNLOAD_URL="https://github.com/$PROJECT_GH/releases/latest/download/helm-diff-$OS-$ARCH.tgz"
@@ -104,9 +105,13 @@ rmTempDir() {
 downloadFile() {
   PLUGIN_TMP_FILE="${HELM_TMP}/${PROJECT_NAME}.tgz"
   echo "Downloading $DOWNLOAD_URL"
-  if type "curl" >/dev/null; then
+  if
+    command -v curl >/dev/null 2>&1
+  then
     curl -L "$DOWNLOAD_URL" -o "$PLUGIN_TMP_FILE"
-  elif type "wget" >/dev/null; then
+  elif
+    command -v wget >/dev/null 2>&1
+  then
     wget -q -O "$PLUGIN_TMP_FILE" "$DOWNLOAD_URL"
   fi
 }