Merge pull request #2398 from ActiveState/mitchell/dx-1612

Use different messages for `state clean uninstall` depending on whether or not `--all` is present.

Author: mitchell-as

internal/locale/locales/en-us.yaml

@@ -1375,6 +1375,12 @@ err_clean_cache_activated:
 err_clean_config_activated:
   other: Cannot remove the config directory while in an activated state. Please deactivate by entering [ACTIONABLE]exit[/RESET] or pressing [ACTIONABLE]Ctrl+D[/RESET] and then try again.
 uninstall_confirm:
+  other: |
+    You are about to remove the State Tool.
+    Your config and cache files will remain.
+    If you would also like to remove those files, add the [ACTIONABLE]--all[/RESET] flag.
+    Continue?
+uninstall_confirm_all:
   other: You are about to remove the State Tool, installed language runtimes, and all configuration information. Continue?
 clean_cache_confirm:
   other: You are about to reset the State Tool cache. Continue?

internal/runners/clean/uninstall.go

@@ -63,7 +63,11 @@ func (u *Uninstall) Run(params *UninstallParams) error {
 
 	if !params.Force {
 		defaultChoice := params.NonInteractive
-		ok, err := u.confirm.Confirm(locale.T("confirm"), locale.T("uninstall_confirm"), &defaultChoice)
+		confirmMessage := locale.T("uninstall_confirm")
+		if params.All {
+			confirmMessage = locale.T("uninstall_confirm_all")
+		}
+		ok, err := u.confirm.Confirm(locale.T("confirm"), confirmMessage, &defaultChoice)
 		if err != nil {
 			return locale.WrapError(err, "err_uninstall_confirm", "Could not confirm uninstall choice")
 		}

test/integration/uninstall_int_test.go

@@ -44,6 +44,9 @@ func (suite *UninstallIntegrationTestSuite) testUninstall(all bool) {
 		cp = ts.Spawn("clean", "uninstall")
 	}
 	cp.Expect("You are about to remove")
+	if !all {
+		cp.Expect("--all") // verify mention of "--all" to remove everything
+	}
 	cp.SendLine("y")
 	if runtime.GOOS == "windows" {
 		cp.ExpectLongString("Deletion of State Tool has been scheduled.")