From 3f5eedb83d5e1f7fb7a27c1335c57b48e3b25cc1 Mon Sep 17 00:00:00 2001 From: SteveLauC Date: Wed, 31 May 2023 15:01:45 +0800 Subject: [PATCH] fix: run AM without sudo (#454) --- src/steps/os/linux.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/steps/os/linux.rs b/src/steps/os/linux.rs index c6ef54ca..d463c248 100644 --- a/src/steps/os/linux.rs +++ b/src/steps/os/linux.rs @@ -528,13 +528,18 @@ fn upgrade_solus(ctx: &ExecutionContext) -> Result<()> { pub fn run_am(ctx: &ExecutionContext) -> Result<()> { let am = require("am")?; - if let Some(sudo) = ctx.sudo() { - ctx.run_type().execute(sudo).arg(am).arg("-u").status_checked()?; + + print_separator("AM"); + + let mut am = ctx.run_type().execute(am); + + if ctx.config().yes(Step::AM) { + am.arg("-U"); } else { - print_warning("No sudo detected. Skipping AM Step"); + am.arg("-u"); } - Ok(()) + am.status_checked() } pub fn run_appman(ctx: &ExecutionContext) -> Result<()> {