From d62a3385f8253a267304bbf874cf4a4a92c0f8ce Mon Sep 17 00:00:00 2001 From: Andrei Pavel Date: Wed, 20 Nov 2019 09:09:10 +0200 Subject: [PATCH] =?UTF-8?q?[=F0=9F=90=9B=20FIX]=20--yes=20for=20apt=20(#25?= =?UTF-8?q?7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/steps/os/linux.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/steps/os/linux.rs b/src/steps/os/linux.rs index 4e14402a..c39bd81d 100644 --- a/src/steps/os/linux.rs +++ b/src/steps/os/linux.rs @@ -273,17 +273,23 @@ fn upgrade_debian(sudo: &Option, cleanup: bool, run_type: RunType, yes: if let Some(sudo) = &sudo { let apt = which("apt-fast").unwrap_or_else(|| PathBuf::from("/usr/bin/apt")); run_type.execute(&sudo).arg(&apt).arg("update").check_run()?; - let mut command = run_type.execute(&sudo); - command.arg(&apt).arg("dist-upgrade").check_run()?; + let mut command = run_type.execute(&sudo); + command.arg(&apt).arg("dist-upgrade"); if yes { command.arg("-y"); } + command.check_run()?; if cleanup { run_type.execute(&sudo).arg(&apt).arg("clean").check_run()?; - run_type.execute(&sudo).arg(&apt).arg("autoremove").check_run()?; + let mut command = run_type.execute(&sudo); + command.arg(&apt).arg("autoremove"); + if yes { + command.arg("-y"); + } + command.check_run()?; } } else { print_warning("No sudo detected. Skipping system upgrade");