lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmd/tailscale/cli: fix running from Xcode 

We were over-eager in running tailscale in GUI mode.
f42ded7acf fixed that by
checking for a variety of shell-ish env vars and using those
to force us into CLI mode.

However, for reasons I don't understand, those shell env vars
are present when Xcode runs Tailscale.app on my machine.
(I've changed no configs, modified nothing on a brand new machine.)
Work around that by adding an additional "only in GUI mode" check.

Signed-off-by: Josh Bleecher Snyder <josharian@gmail.com>
bradfitz/log_rate_test
Josh Bleecher Snyder 2021-05-04 11:00:35 -07:00
parent 4066c606df
commit 7dbbe0c7c7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,14 @@ func ActLikeCLI() bool {
return false return false
} }
// Xcode adds the -NSDocumentRevisionsDebugMode flag on execution.
// If present, we are almost certainly being run as a GUI.
for _, arg := range os.Args {
if arg == "-NSDocumentRevisionsDebugMode" {
return false
}
}
// Looking at the environment of the GUI Tailscale app (ps eww // Looking at the environment of the GUI Tailscale app (ps eww
// $PID), empirically none of these environment variables are // $PID), empirically none of these environment variables are
// present. But all or some of these should be present with // present. But all or some of these should be present with