Skip to content

Commit

Permalink
Fix "tailscale ssh" when built with ts_include_cli tag
Browse files Browse the repository at this point in the history
Signed-off-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
  • Loading branch information
SuperSandro2000 committed May 12, 2024
1 parent 79b2d42 commit 0f3ece8
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions cmd/tailscale/cli/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,6 @@ func runSSH(ctx context.Context, args []string) error {
// of failing. But for now:
return fmt.Errorf("no system 'ssh' command found: %w", err)
}
tailscaleBin, err := os.Executable()
if err != nil {
return err
}
knownHostsFile, err := writeKnownHosts(st)
if err != nil {
return err
Expand Down Expand Up @@ -115,8 +111,7 @@ func runSSH(ctx context.Context, args []string) error {
}

argv = append(argv,
"-o", fmt.Sprintf("ProxyCommand %q %s nc %%h %%p",
tailscaleBin,
"-o", fmt.Sprintf("ProxyCommand tailscale %s nc %%h %%p",
socketArg,
))
}
Expand Down

0 comments on commit 0f3ece8

Please sign in to comment.