From e4e8eb07d2c91d84526fef215a7625a2de5af321 Mon Sep 17 00:00:00 2001
From: Martin Veldwijk <riven@tae.moe>
Date: Mon, 21 Aug 2023 22:01:15 +0000
Subject: [PATCH] Fix for go tools called from make (#568)

Fixes #567 by offloading the `$PATH` interpolation to the shell instead of letting make handle it.
Tested and works on Linux, tested and works on Windows using MSYS2/MingW64. Not tested on a pure Windows env without translation layers, but nothing was changed that would actively break it either.

Reviewed-on: https://gitea.com/gitea/tea/pulls/568
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Reviewed-by: 6543 <6543@obermui.de>
Co-authored-by: Martin Veldwijk <riven@tae.moe>
Co-committed-by: Martin Veldwijk <riven@tae.moe>
---
 .gitignore |  3 ++-
 Makefile   | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9ebe256..1dc5a9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 tea
-/gitea-vet[.exe]
+/gitea-vet
+/gitea-vet.exe
 
 .idea/
 .history/
diff --git a/Makefile b/Makefile
index 381ca47..689d13e 100644
--- a/Makefile
+++ b/Makefile
@@ -67,15 +67,15 @@ vet:
 
 .PHONY: lint
 lint: install-lint-tools
-	revive -config .revive.toml ./... || exit 1
+	$(GO) run github.com/mgechev/revive@latest -config .revive.toml ./... || exit 1
 
 .PHONY: misspell-check
 misspell-check: install-lint-tools
-	misspell -error -i unknwon,destory $(GOFILES)
+	$(GO) run github.com/client9/misspell/cmd/misspell@latest -error -i unknwon,destory $(GOFILES)
 
 .PHONY: misspell
 misspell: install-lint-tools
-	misspell -w -i unknwon $(GOFILES)
+	$(GO) run github.com/client9/misspell/cmd/misspell@latest -w -i unknwon $(GOFILES)
 
 .PHONY: fmt-check
 fmt-check:
@@ -105,7 +105,7 @@ check: test
 .PHONY: install
 install: $(SOURCES)
 	@echo "installing to $(shell $(GO) env GOPATH)/bin/$(EXECUTABLE)"
-	$(GO) install -v $(BUILDMODE) $(GOFLAGS) 
+	$(GO) install -v $(BUILDMODE) $(GOFLAGS)
 
 .PHONY: build
 build: $(EXECUTABLE)
@@ -126,11 +126,11 @@ release-dirs:
 
 .PHONY: release-os
 release-os:
-	CGO_ENABLED=0 gox -verbose -cgo=false $(GOFLAGS) -osarch='!darwin/386 !darwin/arm' -os="windows linux darwin" -arch="386 amd64 arm arm64" -output="$(DIST)/release/tea-$(VERSION)-{{.OS}}-{{.Arch}}"
+	CGO_ENABLED=0 $(GO) run github.com/mitchellh/gox@latest -verbose -cgo=false $(GOFLAGS) -osarch='!darwin/386 !darwin/arm' -os="windows linux darwin" -arch="386 amd64 arm arm64" -output="$(DIST)/release/tea-$(VERSION)-{{.OS}}-{{.Arch}}"
 
 .PHONY: release-compress
 release-compress: install-release-tools
-	cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "compressing $${file}" && gxz -k -9 $${file}; done;
+	cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "compressing $${file}" && $(GO) run github.com/ulikunitz/xz/cmd/gxz@latest -k -9 $${file}; done;
 
 .PHONY: release-check
 release-check: install-release-tools