correct cygwin path resolution

Author: bakito

Makefile

@@ -20,8 +20,10 @@ test-release:
 	goreleaser --skip-publish --snapshot --rm-dist
 
 ## toolbox - start
+## Current working directory
+LOCALDIR ?= $(shell which cygpath > /dev/null 2>&1 && cygpath -m $$(pwd) || pwd)
 ## Location to install dependencies to
-LOCALBIN ?= $(shell test -s "cygpath -m $$(pwd)" || pwd)/bin
+LOCALBIN ?= $(LOCALDIR)/bin
 $(LOCALBIN):
 	mkdir -p $(LOCALBIN)
 
@@ -56,7 +58,7 @@ update-toolbox-tools:
 		$(LOCALBIN)/semver \
 		$(LOCALBIN)/golangci-lint \
 		$(LOCALBIN)/deepcopy-gen
-	toolbox makefile -f $$(pwd)/Makefile \
+	toolbox makefile -f $(LOCALDIR)/Makefile \
 		github.com/bakito/semver \
 		github.com/golangci/golangci-lint/cmd/golangci-lint \
 		k8s.io/code-generator/cmd/[email protected]/kubernetes/code-generator

README.md

@@ -83,8 +83,10 @@ toolbox makefile -f ./Makefile \
 
 ```Makefile
 ## toolbox - start
+## Current working directory
+LOCALDIR ?= $(shell which cygpath > /dev/null 2>&1 && cygpath -m $$(pwd) || pwd)
 ## Location to install dependencies to
-LOCALBIN ?= $(shell test -s "cygpath -m $$(pwd)" || pwd)/bin
+LOCALBIN ?= $(LOCALDIR)/bin
 $(LOCALBIN):
 	mkdir -p $(LOCALBIN)
 
@@ -119,7 +121,7 @@ update-toolbox-tools:
 		$(LOCALBIN)/semver \
 		$(LOCALBIN)/toolbox \
 		$(LOCALBIN)/controller-gen
-	toolbox makefile -f $$(pwd)/Makefile \
+	toolbox makefile -f $(LOCALDIR)/Makefile \
 		github.com/bakito/semver \
 		github.com/bakito/toolbox \
 		sigs.k8s.io/controller-tools/cmd/[email protected]/kubernetes-sigs/controller-tools

pkg/makefile/Makefile.tpl

@@ -1,5 +1,7 @@
+## Current working directory
+LOCALDIR ?= $(shell which cygpath > /dev/null 2>&1 && cygpath -m $$(pwd) || pwd)
 ## Location to install dependencies to
-LOCALBIN ?= $(shell test -s "cygpath -m $$(pwd)" || pwd)/bin
+LOCALBIN ?= $(LOCALDIR)/bin
 $(LOCALBIN):
 	mkdir -p $(LOCALBIN)
 
@@ -27,6 +29,6 @@ update-toolbox-tools:
 	@rm -f{{- range .Tools }} \
 		$(LOCALBIN)/{{.Name}}
 {{- end }}
-	toolbox makefile -f $$(pwd)/Makefile{{- range .Tools }} \
+	toolbox makefile -f $(LOCALDIR)/Makefile{{- range .Tools }} \
 		{{.Tool}}
 {{- end }}

testdata/Makefile.content.expected

@@ -1,8 +1,10 @@
 ...
 
 ## toolbox - start
+## Current working directory
+LOCALDIR ?= $(shell which cygpath > /dev/null 2>&1 && cygpath -m $$(pwd) || pwd)
 ## Location to install dependencies to
-LOCALBIN ?= $(shell test -s "cygpath -m $$(pwd)" || pwd)/bin
+LOCALBIN ?= $(LOCALDIR)/bin
 $(LOCALBIN):
 	mkdir -p $(LOCALBIN)
 
@@ -37,7 +39,7 @@ update-toolbox-tools:
 		$(LOCALBIN)/semver \
 		$(LOCALBIN)/toolbox \
 		$(LOCALBIN)/controller-gen
-	toolbox makefile -f $$(pwd)/Makefile \
+	toolbox makefile -f $(LOCALDIR)/Makefile \
 		github.com/bakito/semver \
 		github.com/bakito/toolbox \
 		sigs.k8s.io/controller-tools/cmd/[email protected]/kubernetes-sigs/controller-tools

testdata/Makefile.expected

@@ -1,6 +1,8 @@
 ## toolbox - start
+## Current working directory
+LOCALDIR ?= $(shell which cygpath > /dev/null 2>&1 && cygpath -m $$(pwd) || pwd)
 ## Location to install dependencies to
-LOCALBIN ?= $(shell test -s "cygpath -m $$(pwd)" || pwd)/bin
+LOCALBIN ?= $(LOCALDIR)/bin
 $(LOCALBIN):
 	mkdir -p $(LOCALBIN)
 
@@ -35,7 +37,7 @@ update-toolbox-tools:
 		$(LOCALBIN)/semver \
 		$(LOCALBIN)/toolbox \
 		$(LOCALBIN)/controller-gen
-	toolbox makefile -f $$(pwd)/Makefile \
+	toolbox makefile -f $(LOCALDIR)/Makefile \
 		github.com/bakito/semver \
 		github.com/bakito/toolbox \
 		sigs.k8s.io/controller-tools/cmd/[email protected]/kubernetes-sigs/controller-tools