Merge pull request #3605 from ActiveState/mitchell/dx-3174

mitchell-as · web-flow · commit c10ecc40afc7 · 2024-11-22T13:22:54.000-05:00
Installing in non-interactive mode on Windows with admin should bypass the prompt.
diff --git a/cmd/state-installer/installer.go b/cmd/state-installer/installer.go
@@ -61,7 +61,8 @@ func (i *Installer) Install() (rerr error) {
 		if i.Params.force {
 			prompter.SetForce(true)
 		}
-		confirm, err := prompter.Confirm("", locale.T("installer_prompt_is_admin"), ptr.To(false), ptr.To(true))
+		defaultChoice := i.Params.nonInteractive
+		confirm, err := prompter.Confirm("", locale.T("installer_prompt_is_admin"), &defaultChoice, ptr.To(true))
 		if err != nil {
 			return errs.Wrap(err, "Not confirmed")
 		}

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,8 @@ func (i *Installer) Install() (rerr error) {`
`61`	`61`	`if i.Params.force {`
`62`	`62`	`prompter.SetForce(true)`
`63`	`63`	`}`
`64`		`- confirm, err := prompter.Confirm("", locale.T("installer_prompt_is_admin"), ptr.To(false), ptr.To(true))`
	`64`	`+ defaultChoice := i.Params.nonInteractive`
	`65`	`+ confirm, err := prompter.Confirm("", locale.T("installer_prompt_is_admin"), &defaultChoice, ptr.To(true))`
`65`	`66`	`if err != nil {`
`66`	`67`	`return errs.Wrap(err, "Not confirmed")`
`67`	`68`	`}`