support different repos

Author: bakito

cmd/makefile.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"errors"
+	"sort"
 
 	"github.com/bakito/toolbox/pkg/makefile"
 	"github.com/go-resty/resty/v2"
@@ -26,6 +27,7 @@ var makefileCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
+		sort.Strings(args)
 		return makefile.Generate(client, cmd.OutOrStderr(), mf, args...)
 	},
 }

pkg/makefile/consts.go

@@ -24,12 +24,13 @@ $(LOCALBIN):
 .PHONY: {{.Name}}
 {{.Name}}: $({{.UpperName}}) ## Download {{.Name}} locally if necessary.
 $({{.UpperName}}): $(LOCALBIN)
-	test -s $(LOCALBIN)/{{.Name}} || GOBIN=$(LOCALBIN) go install {{.Tool}}@$({{.UpperName}}_VERSION)
+	test -s $(LOCALBIN)/{{.Name}} || GOBIN=$(LOCALBIN) go install {{.ToolName}}@$({{.UpperName}}_VERSION)
 {{- end }}
 
 ## Update Tools
 .PHONY: update-toolbox-tools
 update-toolbox-tools:
+	$rm -f{{ range .Tools }} $(LOCALBIN)/{{.Name}}{{ end }}
 	toolbox makefile -f $$(pwd)/Makefile{{- range .Tools }} \
 		{{.Tool}}
 {{- end }}

pkg/makefile/make.go

@@ -65,8 +65,11 @@ func Generate(client *resty.Client, writer io.Writer, makefile string, tools ...
 }
 
 func data(client *resty.Client, tool string) (toolData, error) {
-	match := pattern.FindStringSubmatch(tool)
+	toolRepo := strings.Split(tool, "@")
 
+	toolName := toolRepo[0]
+	repo := toolRepo[len(toolRepo)-1]
+	match := pattern.FindStringSubmatch(repo)
 	t := toolData{}
 
 	if len(match) != 2 {
@@ -78,9 +81,10 @@ func data(client *resty.Client, tool string) (toolData, error) {
 		return t, err
 	}
 
-	parts := strings.Split(tool, "/")
+	parts := strings.Split(toolName, "/")
 
 	t.Version = ghr.TagName
+	t.ToolName = toolName
 	t.Tool = tool
 	t.Name = parts[len(parts)-1]
 	t.UpperName = strings.ReplaceAll(strings.ToUpper(t.Name), "-", "_")
@@ -92,4 +96,5 @@ type toolData struct {
 	UpperName string `json:"UpperName"`
 	Version   string `json:"Version"`
 	Tool      string `json:"Tool"`
+	ToolName  string `json:"ToolName"`
 }

testdata/Makefile.content.expected

@@ -21,6 +21,7 @@ $(TOOLBOX): $(LOCALBIN)
 ## Update Tools
 .PHONY: update-toolbox-tools
 update-toolbox-tools:
+	$rm -f $(LOCALBIN)/toolbox
 	toolbox makefile -f $$(pwd)/Makefile \
 		github.com/bakito/toolbox
 ## toolbox - end

testdata/Makefile.expected

@@ -19,6 +19,7 @@ $(TOOLBOX): $(LOCALBIN)
 ## Update Tools
 .PHONY: update-toolbox-tools
 update-toolbox-tools:
+	$rm -f $(LOCALBIN)/toolbox
 	toolbox makefile -f $$(pwd)/Makefile \
 		github.com/bakito/toolbox
 ## toolbox - end