Skip to content

Commit 74d26ec

Browse files
committed
Move interfactive check
1 parent 22c8db3 commit 74d26ec

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

cmd/state-installer/cmd.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ type Params struct {
4545
command string
4646
force bool
4747
isUpdate bool
48-
isInteractive bool
4948
activate *project.Namespaced
5049
activateDefault *project.Namespaced
5150
}
@@ -128,7 +127,6 @@ func main() {
128127
an.Event(AnalyticsFunnelCat, "start")
129128

130129
params := newParams()
131-
params.isInteractive = terminal.IsTerminal(int(os.Stdin.Fd()))
132130
cmd := captain.NewCommand(
133131
"state-installer",
134132
"",
@@ -389,7 +387,7 @@ func postInstallEvents(out output.Outputer, cfg *config.Instance, an analytics.D
389387
an.EventWithLabel(AnalyticsFunnelCat, "forward-activate-default-err", err.Error())
390388
return errs.Silence(errs.Wrap(err, "Could not activate %s, error returned: %s", params.activateDefault.String(), errs.JoinMessage(err)))
391389
}
392-
case !params.isUpdate && params.isInteractive && os.Getenv(constants.InstallerNoSubshell) != "true":
390+
case !params.isUpdate && terminal.IsTerminal(int(os.Stdin.Fd())) && os.Getenv(constants.InstallerNoSubshell) != "true":
393391
ss := subshell.New(cfg)
394392
ss.SetEnv(osutils.InheritEnv(envMap(binPath)))
395393
if err := ss.Activate(nil, cfg, out); err != nil {

0 commit comments

Comments
 (0)