From fe43a644089b6bdc1099bb04a3a55e4ed44f4b20 Mon Sep 17 00:00:00 2001
From: Pat Riehecky <riehecky@fnal.gov>
Date: Tue, 14 Jul 2026 08:02:58 -0500
Subject: [PATCH] Fix `latest` version

---
 .makefile/helm.mk   | 19 ++++++++++---------
 .makefile/kind.mk   | 18 +++++++++---------
 .makefile/kluctl.mk | 19 ++++++++++---------
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/.makefile/helm.mk b/.makefile/helm.mk
index fac2b63..baa4e9e 100644
--- a/.makefile/helm.mk
+++ b/.makefile/helm.mk
@@ -1,13 +1,14 @@
 ${MY_BINDIR}/helm: | test-jq-is-working
 	@mkdir -p ${MY_BINDIR}
 	@echo ""
-	@if [ "${HELM_VERSION}" = "latest" ]; then \
+	@HELM_VERSION="${HELM_VERSION}"; \
+	if [ "$${HELM_VERSION}" = "latest" ]; then \
 		HELM_VERSION=$$(curl -Lfs https://api.github.com/repos/helm/helm/releases/latest | jq '.tag_name' | tr -d '"'); \
-	fi
-	@echo -e "Downloading \033[1mhelm\033[0m ${HELM_VERSION} for ${OS} ${PLATFORM}..."
-	@echo "  https://get.helm.sh/helm-${HELM_VERSION}-${OS}-${PLATFORM}.tar.gz"
-	@curl -Lf https://get.helm.sh/helm-${HELM_VERSION}-${OS}-${PLATFORM}.tar.gz -o ${MY_BINDIR}/helm-${HELM_VERSION}.tar.gz
-	@cd ${MY_BINDIR} ; tar xf ${MY_BINDIR}/helm-${HELM_VERSION}.tar.gz
-	@cd ${MY_BINDIR} ; mv ${OS}-${PLATFORM}/helm helm-${HELM_VERSION}
-	@chmod +x ${MY_BINDIR}/helm-${HELM_VERSION}
-	@ln -sf ${MY_BINDIR}/helm-${HELM_VERSION} ${MY_BINDIR}/helm
+	fi; \
+	echo -e "Downloading \033[1mhelm\033[0m $${HELM_VERSION} for ${OS} ${PLATFORM}..."; \
+	echo "  https://get.helm.sh/helm-$${HELM_VERSION}-${OS}-${PLATFORM}.tar.gz"; \
+	curl -Lf https://get.helm.sh/helm-$${HELM_VERSION}-${OS}-${PLATFORM}.tar.gz -o ${MY_BINDIR}/helm-$${HELM_VERSION}.tar.gz; \
+	cd ${MY_BINDIR} && tar xf ${MY_BINDIR}/helm-$${HELM_VERSION}.tar.gz; \
+	cd ${MY_BINDIR} && mv ${OS}-${PLATFORM}/helm helm-$${HELM_VERSION}; \
+	chmod +x ${MY_BINDIR}/helm-$${HELM_VERSION}; \
+	ln -sf ${MY_BINDIR}/helm-$${HELM_VERSION} ${MY_BINDIR}/helm
diff --git a/.makefile/kind.mk b/.makefile/kind.mk
index c9b6b26..59a664d 100644
--- a/.makefile/kind.mk
+++ b/.makefile/kind.mk
@@ -1,11 +1,11 @@
 ${MY_BINDIR}/kind-${KIND_VERSION}:
-	@mkdir -p ${MY_BINDIR}
-	@if [ "${KIND_VERSION}" = "latest" ]; then \
+	@mkdir -p ${MY_BINDIR}; \
+	KIND_VERSION="${KIND_VERSION}"; \
+	if [ "$${KIND_VERSION}" = "latest" ]; then \
 		KIND_VERSION=$$(curl -Lfs https://api.github.com/repos/kubernetes-sigs/kind/releases/latest | jq '.tag_name' | tr -d '"'); \
-	fi
-	@echo "Downloading kind ${KIND_VERSION} for ${OS} ${PLATFORM}..."
-	@echo "  https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-${OS}-${PLATFORM}"
-	@curl -Lfs https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-${OS}-${PLATFORM} -o ${MY_BINDIR}/kind-${KIND_VERSION}
-	@chmod +x ${MY_BINDIR}/kind-${KIND_VERSION}
-${MY_BINDIR}/kind: ${MY_BINDIR}/kind-${KIND_VERSION}
-	@ln -sf ${MY_BINDIR}/kind-${KIND_VERSION} ${MY_BINDIR}/kind
+	fi; \
+	echo "Downloading kind $${KIND_VERSION} for ${OS} ${PLATFORM}..."; \
+	echo "  https://github.com/kubernetes-sigs/kind/releases/download/$${KIND_VERSION}/kind-${OS}-${PLATFORM}"; \
+	curl -Lfs https://github.com/kubernetes-sigs/kind/releases/download/$${KIND_VERSION}/kind-${OS}-${PLATFORM} -o ${MY_BINDIR}/kind-$${KIND_VERSION}; \
+	chmod +x ${MY_BINDIR}/kind-$${KIND_VERSION}; \
+	ln -sf ${MY_BINDIR}/kind-$${KIND_VERSION} ${MY_BINDIR}/kind
diff --git a/.makefile/kluctl.mk b/.makefile/kluctl.mk
index 75814a2..777ccaa 100644
--- a/.makefile/kluctl.mk
+++ b/.makefile/kluctl.mk
@@ -1,13 +1,14 @@
 ${MY_BINDIR}/kluctl: | test-jq-is-working
 	@mkdir -p ${MY_BINDIR}
 	@echo ""
-	@if [ "${KLUCTL_VERSION}" = "latest" ]; then \
+	@KLUCTL_VERSION="${KLUCTL_VERSION}"; \
+	if [ "$${KLUCTL_VERSION}" = "latest" ]; then \
 		KLUCTL_VERSION=$$(curl -Lfs https://api.github.com/repos/kluctl/kluctl/releases/latest | jq '.tag_name' | tr -d '"'); \
-	fi
-	@echo -e "Downloading \033[1mkluctl\033[0m ${KLUCTL_VERSION} for ${OS} ${PLATFORM}..."
-	@echo "  https://github.com/kluctl/kluctl/releases/download/${KLUCTL_VERSION}/kluctl_${KLUCTL_VERSION}_${OS}_${PLATFORM}.tar.gz"
-	@curl -Lf https://github.com/kluctl/kluctl/releases/download/${KLUCTL_VERSION}/kluctl_${KLUCTL_VERSION}_${OS}_${PLATFORM}.tar.gz -o ${MY_BINDIR}/kluctl-${KLUCTL_VERSION}.tar.gz
-	@cd ${MY_BINDIR} ; tar xf ${MY_BINDIR}/kluctl-${KLUCTL_VERSION}.tar.gz
-	@cd ${MY_BINDIR} ; mv kluctl kluctl-${KLUCTL_VERSION}
-	@chmod +x ${MY_BINDIR}/kluctl-${KLUCTL_VERSION}
-	@ln -sf ${MY_BINDIR}/kluctl-${KLUCTL_VERSION} ${MY_BINDIR}/kluctl
+	fi; \
+	echo -e "Downloading \033[1mkluctl\033[0m $${KLUCTL_VERSION} for ${OS} ${PLATFORM}..."; \
+	echo "  https://github.com/kluctl/kluctl/releases/download/$${KLUCTL_VERSION}/kluctl_$${KLUCTL_VERSION}_${OS}_${PLATFORM}.tar.gz"; \
+	curl -Lf https://github.com/kluctl/kluctl/releases/download/$${KLUCTL_VERSION}/kluctl_$${KLUCTL_VERSION}_${OS}_${PLATFORM}.tar.gz -o ${MY_BINDIR}/kluctl-$${KLUCTL_VERSION}.tar.gz; \
+	cd ${MY_BINDIR} && tar xf ${MY_BINDIR}/kluctl-$${KLUCTL_VERSION}.tar.gz; \
+	cd ${MY_BINDIR} && mv kluctl kluctl-$${KLUCTL_VERSION}; \
+	chmod +x ${MY_BINDIR}/kluctl-$${KLUCTL_VERSION}; \
+	ln -sf ${MY_BINDIR}/kluctl-$${KLUCTL_VERSION} ${MY_BINDIR}/kluctl