From c0186c670164b8cb02ae1bd46d27904b67f01dcc Mon Sep 17 00:00:00 2001
From: Kristoffer Dalby <kristoffer@tailscale.com>
Date: Fri, 3 Jan 2025 12:25:04 +0100
Subject: [PATCH] tool: use same helm regardless of Nix

Remove the check if the shell is Nix based, it looks
for a nix store path, which on nix-darwin will not start
with /nix/store (but /etc/profile).

./tool/helm is no used regardless of nix, and nix shell
is using that since prev commit.

Updates #25620

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
---
 tool/helm | 47 ++++++++++++++++++-----------------------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/tool/helm b/tool/helm
index 3f9a9dfd5..744d5b6c4 100755
--- a/tool/helm
+++ b/tool/helm
@@ -32,36 +32,25 @@ fi
 
     if [[ "$want_rev" != "$got_rev" ]]; then
         rm -rf "$cachedir" "$tarball"
-        if [[ -n "${IN_NIX_SHELL:-}" ]]; then
-            nix_helm="$(which -a helm | grep /nix/store | head -1)"
-            nix_helm="${nix_helm%/helm}"
-            nix_helm_rev="${nix_helm##*-}"
-            if [[ "$nix_helm_rev" != "$want_rev" ]]; then
-                echo "Wrong helm version in Nix, got $nix_helm_rev want $want_rev" >&2
-		        exit 1
-            fi
-            ln -sf "$nix_helm" "$cachedir"
-        else
-            # works for linux and darwin
-            # https://github.com/helm/helm/releases
-            OS=$(uname -s | tr A-Z a-z)
-            ARCH=$(uname -m)
-            if [ "$ARCH" = "x86_64" ]; then
-                ARCH="amd64"
-            fi
-            if [ "$ARCH" = "aarch64" ]; then
-                ARCH="arm64"
-            fi
-            mkdir -p "$cachedir"
-            # When running on GitHub in CI, the below curl sometimes fails with
-            # INTERNAL_ERROR after finishing the download. The most common cause
-            # of INTERNAL_ERROR is glitches in intermediate hosts handling of
-            # HTTP/2 forwarding, so forcing HTTP 1.1 often fixes the issue. See
-            # https://github.com/tailscale/tailscale/issues/8988
-	        curl -f -L --http1.1 -o "$tarball" -sSL "https://get.helm.sh/helm-v${want_rev}-${OS}-${ARCH}.tar.gz"
-            (cd "$cachedir" && tar --strip-components=1 -xf "$tarball")
-            rm -f "$tarball"
+        # works for linux and darwin
+        # https://github.com/helm/helm/releases
+        OS=$(uname -s | tr A-Z a-z)
+        ARCH=$(uname -m)
+        if [ "$ARCH" = "x86_64" ]; then
+            ARCH="amd64"
         fi
+        if [ "$ARCH" = "aarch64" ]; then
+            ARCH="arm64"
+        fi
+        mkdir -p "$cachedir"
+        # When running on GitHub in CI, the below curl sometimes fails with
+        # INTERNAL_ERROR after finishing the download. The most common cause
+        # of INTERNAL_ERROR is glitches in intermediate hosts handling of
+        # HTTP/2 forwarding, so forcing HTTP 1.1 often fixes the issue. See
+        # https://github.com/tailscale/tailscale/issues/8988
+	    curl -f -L --http1.1 -o "$tarball" -sSL "https://get.helm.sh/helm-v${want_rev}-${OS}-${ARCH}.tar.gz"
+        (cd "$cachedir" && tar --strip-components=1 -xf "$tarball")
+        rm -f "$tarball"
     fi
 )