implode|prune: support --yes

Fixes #982
jdx · Nov 8, 2023 · ea5b5d6 · ea5b5d6
1 parent 231e1d0
commit ea5b5d6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/src/cli/implode.rs b/src/cli/implode.rs
@@ -1,4 +1,5 @@
 use color_eyre::eyre::Result;
+use std::path::Path;
 
 use crate::cli::command::Command;
 use crate::config::Config;
@@ -23,7 +24,7 @@ pub struct Implode {
 }
 
 impl Command for Implode {
-    fn run(self, _config: Config, out: &mut Output) -> Result<()> {
+    fn run(self, config: Config, out: &mut Output) -> Result<()> {
         let mut files = vec![&*dirs::ROOT, &*dirs::CACHE, &*env::RTX_EXE];
         if self.config {
             files.push(&*dirs::CONFIG);
@@ -33,20 +34,32 @@ impl Command for Implode {
                 rtxprintln!(out, "rm -rf {}", f.display());
             }
 
-            if f.is_dir() {
-                if !self.dry_run && prompt::confirm(&format!("remove {} ?", f.display()))? {
+            if self.confirm_remove(&config, f)? {
+                if f.is_dir() {
                     remove_all(f)?;
-                    return Ok(());
+                } else {
+                    file::remove_file(f)?;
                 }
-            } else if !self.dry_run && prompt::confirm(&format!("remove {} ?", f.display()))? {
-                file::remove_file(f)?;
             }
         }
 
         Ok(())
     }
 }
 
+impl Implode {
+    fn confirm_remove(&self, config: &Config, f: &Path) -> Result<bool> {
+        if self.dry_run {
+            Ok(false)
+        } else if config.settings.yes {
+            Ok(true)
+        } else {
+            let r = prompt::confirm(&format!("remove {} ?", f.display()))?;
+            Ok(r)
+        }
+    }
+}
+
 #[cfg(test)]
 #[cfg(test)]
 mod tests {

diff --git a/src/cli/prune.rs b/src/cli/prune.rs
@@ -64,7 +64,7 @@ impl Prune {
             if self.dry_run {
                 pr.set_prefix(format!("{} {} ", pr.prefix(), style("[dryrun]").bold()));
             }
-            if prompt::confirm(&format!("remove {} ?", &tv))? {
+            if config.settings.yes || prompt::confirm(&format!("remove {} ?", &tv))? {
                 p.decorate_progress_bar(&mut pr, Some(&tv));
                 p.uninstall_version(config, &tv, &pr, self.dry_run)?;
                 pr.finish();