TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 13:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale/cli: use "account" instead of "profile" in user-visible text

Browse Source 
Matches the UI clients

Updates #713

Signed-off-by: Mihai Parparita <mihai@tailscale.com>
This commit is contained in:
Mihai Parparita 2022-12-01 16:29:44 -08:00 committed by Mihai Parparita
parent d6dbefaa91
commit 5b8323509f
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ type setArgsT struct {
func newSetFlagSet(goos string, setArgs *setArgsT) *flag.FlagSet { func newSetFlagSet(goos string, setArgs *setArgsT) *flag.FlagSet {
setf := newFlagSet("set") setf := newFlagSet("set")
setf.StringVar(&setArgs.profileName, "nickname", "", "nickname for the login profile") setf.StringVar(&setArgs.profileName, "nickname", "", "nickname for the current account")
setf.BoolVar(&setArgs.acceptRoutes, "accept-routes", false, "accept routes advertised by other Tailscale nodes") setf.BoolVar(&setArgs.acceptRoutes, "accept-routes", false, "accept routes advertised by other Tailscale nodes")
setf.BoolVar(&setArgs.acceptDNS, "accept-dns", false, "accept DNS configuration from the admin panel") setf.BoolVar(&setArgs.acceptDNS, "accept-dns", false, "accept DNS configuration from the admin panel")
setf.StringVar(&setArgs.exitNodeIP, "exit-node", "", "Tailscale exit node (IP or base name) for internet traffic, or empty string to not use an exit node") setf.StringVar(&setArgs.exitNodeIP, "exit-node", "", "Tailscale exit node (IP or base name) for internet traffic, or empty string to not use an exit node")

14
cmd/tailscale/cli/switch.go
View File

@ -17,10 +17,10 @@
var switchCmd = &ffcli.Command{ var switchCmd = &ffcli.Command{
Name: "switch", Name: "switch",
ShortHelp: "Switches to a different Tailscale profile", ShortHelp: "Switches to a different Tailscale account",
FlagSet: func() *flag.FlagSet { FlagSet: func() *flag.FlagSet {
fs := flag.NewFlagSet("switch", flag.ExitOnError) fs := flag.NewFlagSet("switch", flag.ExitOnError)
fs.BoolVar(&switchArgs.list, "list", false, "list available profiles") fs.BoolVar(&switchArgs.list, "list", false, "list available accounts")
return fs return fs
}(), }(),
Exec: switchProfile, Exec: switchProfile,
@ -29,7 +29,7 @@
[ALPHA] switch <name> [ALPHA] switch <name>
[ALPHA] switch --list [ALPHA] switch --list
"tailscale switch" switches between logged in profiles. "tailscale switch" switches between logged in accounts.
This command is currently in alpha and may change in the future.` This command is currently in alpha and may change in the future.`
}, },
} }
@ -63,7 +63,7 @@ func switchProfile(ctx context.Context, args []string) error {
} }
cp, all, err := localClient.ProfileStatus(ctx) cp, all, err := localClient.ProfileStatus(ctx)
if err != nil { if err != nil {
errf("Failed to switch to profile: %v\n", err) errf("Failed to switch to account: %v\n", err)
os.Exit(1) os.Exit(1)
} }
var profID ipn.ProfileID var profID ipn.ProfileID
@ -78,14 +78,14 @@ func switchProfile(ctx context.Context, args []string) error {
os.Exit(1) os.Exit(1)
} }
if profID == cp.ID { if profID == cp.ID {
printf("Already on profile %q\n", args[0]) printf("Already on account %q\n", args[0])
os.Exit(0) os.Exit(0)
} }
if err := localClient.SwitchProfile(ctx, profID); err != nil { if err := localClient.SwitchProfile(ctx, profID); err != nil {
errf("Failed to switch to profile: %v\n", err) errf("Failed to switch to account: %v\n", err)
os.Exit(1) os.Exit(1)
} }
printf("Switching to profile %q\n", args[0]) printf("Switching to account %q\n", args[0])
for { for {
select { select {
case <-ctx.Done(): case <-ctx.Done():

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

@ -125,7 +125,7 @@ func newUpFlagSet(goos string, upArgs *upArgsT, cmd string) *flag.FlagSet {
upf.DurationVar(&upArgs.timeout, "timeout", 0, "maximum amount of time to wait for tailscaled to enter a Running state; default (0s) blocks forever") upf.DurationVar(&upArgs.timeout, "timeout", 0, "maximum amount of time to wait for tailscaled to enter a Running state; default (0s) blocks forever")
if cmd == "login" { if cmd == "login" {
upf.StringVar(&upArgs.profileName, "nickname", "", "short name for the login profile") upf.StringVar(&upArgs.profileName, "nickname", "", "short name for the account")
} }
if cmd == "up" { if cmd == "up" {