cmd/tailscale: move call to cli.CleanUpArgs() from main() into cli.Run() (tailscale#4954)

jwhited · web-flow · commit bef6e2831a9b · 2022-06-27T14:56:25.000-07:00
Not all distributions build from package main.

Signed-off-by: Jordan Whited &lt;jordan@tailscale.com&gt;
diff --git a/cmd/tailscale/cli/cli.go b/cmd/tailscale/cli/cli.go
@@ -129,6 +129,8 @@ var localClient tailscale.LocalClient
 
 // Run runs the CLI. The args do not include the binary name.
 func Run(args []string) (err error) {
+	args = CleanUpArgs(args)
+
 	if len(args) == 1 && (args[0] == "-V" || args[0] == "--version") {
 		args = []string{"version"}
 	}
diff --git a/cmd/tailscale/tailscale.go b/cmd/tailscale/tailscale.go
@@ -17,7 +17,6 @@ import (
 
 func main() {
 	args := os.Args[1:]
-	args = cli.CleanUpArgs(args)
 	if name, _ := os.Executable(); strings.HasSuffix(filepath.Base(name), ".cgi") {
 		args = []string{"web", "-cgi"}
 	}

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,8 @@ var localClient tailscale.LocalClient`
`129`	`129`
`130`	`130`	`// Run runs the CLI. The args do not include the binary name.`
`131`	`131`	`func Run(args []string) (err error) {`
	`132`	`+ args = CleanUpArgs(args)`
	`133`	`+`
`132`	`134`	`if len(args) == 1 && (args[0] == "-V" \|\| args[0] == "--version") {`
`133`	`135`	`args = []string{"version"}`
`134`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ import (`
`17`	`17`
`18`	`18`	`func main() {`
`19`	`19`	`args := os.Args[1:]`
`20`		`- args = cli.CleanUpArgs(args)`
`21`	`20`	`if name, _ := os.Executable(); strings.HasSuffix(filepath.Base(name), ".cgi") {`
`22`	`21`	`args = []string{"web", "-cgi"}`
`23`	`22`	`}`