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

Run homebrew cask upgrade if available (fix #117)

Browse Source
This commit is contained in:
Roey Darwish Dror
2019-02-03 10:12:54 +02:00
parent b780642a67
commit a6df57a781
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,10 @@
use crate::error::Error; use crate::error::Error;
use crate::executor::RunType; use crate::executor::{CommandExt, RunType};
use crate::terminal::print_separator; use crate::terminal::print_separator;
use crate::utils::which; use crate::utils::which;
use directories::BaseDirs; use directories::BaseDirs;
use std::path::Path;
use std::process::Command;
pub fn run_zplug(base_dirs: &BaseDirs, run_type: RunType) -> Option<(&'static str, bool)> { pub fn run_zplug(base_dirs: &BaseDirs, run_type: RunType) -> Option<(&'static str, bool)> {
if let Some(zsh) = which("zsh") { if let Some(zsh) = which("zsh") {
@@ -55,7 +57,18 @@ pub fn run_homebrew(cleanup: bool, run_type: RunType) -> Option<(&'static str, b
let inner = || -> Result<(), Error> { let inner = || -> Result<(), Error> {
run_type.execute(&brew).arg("update").check_run()?; run_type.execute(&brew).arg("update").check_run()?;
run_type.execute(&brew).arg("upgrade").check_run()?; run_type.execute(&brew).arg("upgrade").check_run()?;
run_type.execute(&brew).args(&["cask", "upgrade"]).check_run()?;
let cask_upgrade_exists = Command::new(&brew)
.args(&["--repository", "buo/cask-upgrade"])
.check_output()
.map(|p| Path::new(p.trim()).exists())?;
if cask_upgrade_exists {
run_type.execute(&brew).args(&["cu", "-a"]).check_run()?;
} else {
run_type.execute(&brew).args(&["cask", "upgrade"]).check_run()?;
}
if cleanup { if cleanup {
run_type.execute(&brew).arg("cleanup").check_run()?; run_type.execute(&brew).arg("cleanup").check_run()?;
} }