Skip to content

ref: Simplify is_homebrew_install #2434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 25, 2025
Merged

ref: Simplify is_homebrew_install #2434

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions src/utils/system.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,6 @@ pub fn propagate_exit_status(status: process::ExitStatus) {
}
}

#[cfg(not(windows))]
fn is_homebrew_install_result() -> Result<bool> {
let mut exe = env::current_exe()?.canonicalize()?;
exe.pop();
exe.set_file_name("INSTALL_RECEIPT.json");
Ok(exe.is_file())
}

#[cfg(windows)]
fn is_homebrew_install_result() -> Result<bool> {
Ok(false)
}

fn is_npm_install_result() -> Result<bool> {
let mut exe = env::current_exe()?.canonicalize()?;
exe.set_file_name("package.json");
Expand All @@ -48,7 +35,14 @@ fn is_npm_install_result() -> Result<bool> {

/// Checks if we were installed from homebrew
pub fn is_homebrew_install() -> bool {
is_homebrew_install_result().unwrap_or(false)
#[cfg(not(windows))]
if let Ok(mut exe) = env::current_exe().and_then(|p| p.canonicalize()) {
exe.pop();
exe.set_file_name("INSTALL_RECEIPT.json");
return exe.is_file();
}

false
}

/// Checks if we were installed via npm
Expand Down