Merge pull request #2950 from thaJeztah/fix_usage_and_completion

crazy-max · web-flow · commit cf8bf9e104ad · 2025-02-02T01:11:29.000+01:00
fix: strip path from usage output and shell-completion scripts
diff --git a/cmd/buildx/main.go b/cmd/buildx/main.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"path/filepath"
 
 	"github.com/docker/buildx/commands"
 	controllererrors "github.com/docker/buildx/controller/errdefs"
@@ -41,7 +42,8 @@ func runStandalone(cmd *command.DockerCli) error {
 	}
 	defer flushMetrics(cmd)
 
-	rootCmd := commands.NewRootCmd(os.Args[0], false, cmd)
+	executable := os.Args[0]
+	rootCmd := commands.NewRootCmd(filepath.Base(executable), false, cmd)
 	return rootCmd.Execute()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"fmt"`
`6`	`6`	`"os"`
	`7`	`+ "path/filepath"`
`7`	`8`
`8`	`9`	`"github.com/docker/buildx/commands"`
`9`	`10`	`controllererrors "github.com/docker/buildx/controller/errdefs"`
`@@ -41,7 +42,8 @@ func runStandalone(cmd *command.DockerCli) error {`
`41`	`42`	`}`
`42`	`43`	`defer flushMetrics(cmd)`
`43`	`44`
`44`		`- rootCmd := commands.NewRootCmd(os.Args[0], false, cmd)`
	`45`	`+ executable := os.Args[0]`
	`46`	`+ rootCmd := commands.NewRootCmd(filepath.Base(executable), false, cmd)`
`45`	`47`	`return rootCmd.Execute()`
`46`	`48`	`}`
`47`	`49`