TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-12-04 23:45:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Not all distributions build from package main.

Signed-off-by: Jordan Whited <jordan@tailscale.com>
(cherry picked from commit bef6e2831a)
This commit is contained in:
Jordan Whited 2022-06-27 14:56:25 -07:00 committed by Denton Gentry
parent e4d881923f
commit e7d5d90037
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/tailscale/cli/cli.go
View File

@ -129,6 +129,8 @@ func CleanUpArgs(args []string) []string {
// Run runs the CLI. The args do not include the binary name. // Run runs the CLI. The args do not include the binary name.
func Run(args []string) (err error) { func Run(args []string) (err error) {
args = CleanUpArgs(args)
if len(args) == 1 && (args[0] == "-V" || args[0] == "--version") { if len(args) == 1 && (args[0] == "-V" || args[0] == "--version") {
args = []string{"version"} args = []string{"version"}
} }

1
cmd/tailscale/tailscale.go
View File

@ -17,7 +17,6 @@
func main() { func main() {
args := os.Args[1:] args := os.Args[1:]
args = cli.CleanUpArgs(args)
if name, _ := os.Executable(); strings.HasSuffix(filepath.Base(name), ".cgi") { if name, _ := os.Executable(); strings.HasSuffix(filepath.Base(name), ".cgi") {
args = []string{"web", "-cgi"} args = []string{"web", "-cgi"}
} }