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

refactor(yarn): remove unnecessary Yarn::yarn field

Browse Source
This commit is contained in:
Andre Toerien
2025-06-25 15:59:57 +02:00
committed by Gideon
parent 4da696321a
commit 0e43e0d7fc
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/steps/node.rs
View File

@@ -117,15 +117,11 @@ impl NPM {
struct Yarn { struct Yarn {
command: PathBuf, command: PathBuf,
yarn: Option<PathBuf>,
} }
impl Yarn { impl Yarn {
fn new(command: PathBuf) -> Self { fn new(command: PathBuf) -> Self {
Self { Self { command }
command,
yarn: require("yarn").ok(),
}
} }
fn has_global_subcmd(&self) -> bool { fn has_global_subcmd(&self) -> bool {
@@ -153,8 +149,7 @@ impl Yarn {
if use_sudo { if use_sudo {
let sudo = ctx.require_sudo()?; let sudo = ctx.require_sudo()?;
let command = self.yarn.as_ref().unwrap_or(&self.command); sudo.execute(ctx, &self.command)?.args(args).status_checked()?;
sudo.execute(ctx, command)?.args(args).status_checked()?;
} else { } else {
ctx.execute(&self.command).args(args).status_checked()?; ctx.execute(&self.command).args(args).status_checked()?;
} }