Skip to content

Commit f2550f0

Browse files
authored
Merge pull request #2109 from ActiveState/DX-1242
Installer only starts subshell in interactive terminal
2 parents 1c50382 + 74d26ec commit f2550f0

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

cmd/state-installer/cmd.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"github.com/ActiveState/cli/pkg/cmdlets/errors"
3333
"github.com/ActiveState/cli/pkg/project"
3434
"github.com/ActiveState/cli/pkg/sysinfo"
35+
"golang.org/x/crypto/ssh/terminal"
3536
)
3637

3738
const AnalyticsCat = "installer"
@@ -386,7 +387,7 @@ func postInstallEvents(out output.Outputer, cfg *config.Instance, an analytics.D
386387
an.EventWithLabel(AnalyticsFunnelCat, "forward-activate-default-err", err.Error())
387388
return errs.Silence(errs.Wrap(err, "Could not activate %s, error returned: %s", params.activateDefault.String(), errs.JoinMessage(err)))
388389
}
389-
case !params.isUpdate && os.Getenv(constants.InstallerNoSubshell) != "true":
390+
case !params.isUpdate && terminal.IsTerminal(int(os.Stdin.Fd())) && os.Getenv(constants.InstallerNoSubshell) != "true":
390391
ss := subshell.New(cfg)
391392
ss.SetEnv(osutils.InheritEnv(envMap(binPath)))
392393
if err := ss.Activate(nil, cfg, out); err != nil {

0 commit comments

Comments
 (0)