Skip to content

Commit

Permalink
typo
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasfernog committed Oct 11, 2024
1 parent b5110af commit 419ae9a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions crates/tauri-cli/src/info/packages_nodejs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,25 +87,25 @@ pub fn package_manager(app_dir: &PathBuf) -> PackageManager {
return PackageManager::Npm;
}

let pkg_manger = found[0];
let pkg_manager = found[0];

if found.len() > 1 {
println!(
"{}: Only one package manager should be used, but found {}.\n Please remove unused package manager lock files, will use {} for now!",
"WARNING".yellow(),
found.iter().map(ToString::to_string).collect::<Vec<_>>().join(" and "),
pkg_manger
pkg_manager
);
}

if pkg_manger == PackageManager::Yarn
if pkg_manager == PackageManager::Yarn
&& manager_version("yarn")
.map(|v| v.chars().next().map(|c| c > '1').unwrap_or_default())
.unwrap_or(false)
{
PackageManager::YarnBerry
} else {
pkg_manger
pkg_manager
}
}

Expand Down

0 comments on commit 419ae9a

Please sign in to comment.