TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-26 03:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale/cli: hide Windows named pipe default name in flag help

Browse Source 
It's long & distracting for how low value it is.

Fixes #6766

Change-Id: I51364f25c0088d9e63deb9f692ba44031f12251b
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2022-12-19 10:01:43 -08:00 committed by Brad Fitzpatrick
parent 5caf609d7b
commit a06217a8bd
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,7 @@ func Run(args []string) (err error) {
}) })
rootfs := newFlagSet("tailscale") rootfs := newFlagSet("tailscale")
rootfs.StringVar(&rootArgs.socket, "socket", paths.DefaultTailscaledSocket(), "path to tailscaled's unix socket") rootfs.StringVar(&rootArgs.socket, "socket", paths.DefaultTailscaledSocket(), "path to tailscaled socket")
rootCmd := &ffcli.Command{ rootCmd := &ffcli.Command{
Name: "tailscale", Name: "tailscale",
@ -297,7 +297,14 @@ func usageFuncOpt(c *ffcli.Command, withDefaults bool) string {
s += "\n \t" s += "\n \t"
s += strings.ReplaceAll(usage, "\n", "\n \t") s += strings.ReplaceAll(usage, "\n", "\n \t")
if f.DefValue != "" && withDefaults { showDefault := f.DefValue != "" && withDefaults
// Issue 6766: don't show the default Windows socket path. It's long
// and distracting. And people on on Windows aren't likely to ever
// change it anyway.
if runtime.GOOS == "windows" && f.Name == "socket" && strings.HasPrefix(f.DefValue, `\\.\pipe\ProtectedPrefix\`) {
showDefault = false
}
if showDefault {
s += fmt.Sprintf(" (default %s)", f.DefValue) s += fmt.Sprintf(" (default %s)", f.DefValue)
} }