admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(sudo): add SudoExecuteOpts builder functions and preserve_env enum

Browse Source
This commit is contained in:
Andre Toerien
2025-07-16 00:11:20 +02:00
committed by Gideon
parent 306ff3c7c5
commit b6c1290934
4 changed files with 105 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/steps/generic.rs
View File

@@ -127,17 +127,9 @@ pub fn run_rubygems(ctx: &ExecutionContext) -> Result<()> {
} else {
let sudo = ctx.require_sudo()?;
if !Path::new("/usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb").exists() {
sudo.execute_opts(
ctx,
&gem,
SudoExecuteOpts {
preserve_env: Some(&[]),
set_home: true,
..Default::default()
},
)?
.args(["update", "--system"])
.status_checked()?;
sudo.execute_opts(ctx, &gem, SudoExecuteOpts::new().preserve_env().set_home())?
.args(["update", "--system"])
.status_checked()?;
}
}

11
src/steps/os/linux.rs
View File

@@ -993,15 +993,8 @@ pub fn run_config_update(ctx: &ExecutionContext) -> Result<()> {
}
print_separator(t!("Configuration update"));
sudo.execute_opts(
ctx,
&pacdiff,
SudoExecuteOpts {
preserve_env: Some(&["DIFFPROG"]),
..Default::default()
},
)?
.status_checked()?;
sudo.execute_opts(ctx, &pacdiff, SudoExecuteOpts::new().preserve_env_list(&["DIFFPROG"]))?
.status_checked()?;
}
Ok(())

31
src/steps/os/unix.rs
View File

@@ -330,18 +330,10 @@ pub fn run_brew_formula(ctx: &ExecutionContext, variant: BrewVariant) -> Result<
print_separator(format!("{} ({})", variant.step_title(), sudo_as_user));
let sudo = ctx.require_sudo()?;
sudo.execute_opts(
ctx,
&binary_name,
SudoExecuteOpts {
set_home: true,
user: Some(&user.name),
..Default::default()
},
)?
.current_dir("/tmp") // brew needs a writable current directory
.arg("update")
.status_checked()?;
sudo.execute_opts(ctx, &binary_name, SudoExecuteOpts::new().set_home().user(&user.name))?
.current_dir("/tmp") // brew needs a writable current directory
.arg("update")
.status_checked()?;
return Ok(());
}
}
@@ -557,17 +549,10 @@ pub fn run_nix_self_upgrade(ctx: &ExecutionContext) -> Result<()> {
let nix_args = nix_args();
if multi_user {
let sudo = ctx.require_sudo()?;
sudo.execute_opts(
ctx,
&nix,
SudoExecuteOpts {
interactive: true,
..Default::default()
},
)?
.args(nix_args)
.arg("upgrade-nix")
.status_checked()
sudo.execute_opts(ctx, &nix, SudoExecuteOpts::new().interactive())?
.args(nix_args)
.arg("upgrade-nix")
.status_checked()
} else {
ctx.execute(&nix).args(nix_args).arg("upgrade-nix").status_checked()
}