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

Fix Linuxbrew (fix #616) (#620)

Browse Source
This commit is contained in:
Roey Darwish Dror
2021-02-08 11:33:06 +02:00
committed by GitHub
parent e38fc78c3b
commit 098b60ba38
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,8 @@ use std::path::PathBuf;
use std::process::Command; use std::process::Command;
use std::{env, path::Path}; use std::{env, path::Path};
const INTEL_BREW: &str = "/usr/local/bin/brew";
const ARM_BREW: &str = "/opt/homebrew/bin/brew";
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]
#[allow(dead_code)] #[allow(dead_code)]
pub enum BrewVariant { pub enum BrewVariant {
@@ -27,14 +29,14 @@ pub enum BrewVariant {
impl BrewVariant { impl BrewVariant {
fn binary_name(self) -> &'static str { fn binary_name(self) -> &'static str {
match self { match self {
BrewVariant::Linux => "/home/linuxbrew/.linuxbrew/bin/brew", BrewVariant::Linux => "brew",
BrewVariant::MacIntel => "/usr/local/bin/brew", BrewVariant::MacIntel => INTEL_BREW,
BrewVariant::MacArm => "/opt/homebrew/bin/brew", BrewVariant::MacArm => ARM_BREW,
} }
} }
fn both_both_exist() -> bool { fn both_both_exist() -> bool {
Path::new("/usr/local/bin/brew").exists() && Path::new("/opt/homebrew/bin/brew").exists() Path::new(INTEL_BREW).exists() && Path::new(ARM_BREW).exists()
} }
pub fn step_title(self) -> &'static str { pub fn step_title(self) -> &'static str {