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

Fix oh-my-zsh upgrade (fix #224)

Browse Source
This commit is contained in:
Roey Darwish Dror
2019-09-10 23:06:42 +03:00
parent 1a852250ff
commit eb6460853d
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,31 +23,36 @@ pub fn run_zr(base_dirs: &BaseDirs, run_type: RunType) -> Result<(), Error> {
run_type.execute(zsh).args(&["-c", cmd.as_str()]).check_run()
}
fn zshrc(base_dirs: &BaseDirs) -> PathBuf {
env::var("ZDOTDIR")
.map(|p| Path::new(&p).join(".zshrc"))
.unwrap_or_else(|_| base_dirs.home_dir().join(".zshrc"))
}
pub fn run_zplug(base_dirs: &BaseDirs, run_type: RunType) -> Result<(), Error> {
let zsh = require("zsh")?;
let zshrc = zshrc(base_dirs).require()?;
env::var("ZPLUG_HOME")
.map(PathBuf::from)
.unwrap_or_else(|_| base_dirs.home_dir().join("zplug"))
.require()?;
let zshrc = env::var("ZDOTDIR")
.map(|p| Path::new(&p).join(".zshrc"))
.unwrap_or_else(|_| base_dirs.home_dir().join(".zshrc"))
.require()?;
print_separator("zplug");
let cmd = format!("source {} && zplug update", zshrc.display());
run_type.execute(zsh).args(&["-c", cmd.as_str()]).check_run()
}
pub fn run_oh_my_zsh(run_type: RunType) -> Result<(), Error> {
let upgrade = require("upgrade_oh_my_zsh")?;
pub fn run_oh_my_zsh(base_dirs: &BaseDirs, run_type: RunType) -> Result<(), Error> {
let zsh = require("zsh")?;
let zshrc = zshrc(base_dirs).require()?;
base_dirs.home_dir().join(".oh-my-zsh").require()?;
print_separator("oh-my-zsh");
run_type.execute(upgrade).check_run()
let cmd = format!("source {} && upgrade_oh_my_zsh", zshrc.display());
run_type.execute(zsh).args(&["-c", cmd.as_str()]).check_run()
}
pub fn run_fisher(base_dirs: &BaseDirs, run_type: RunType) -> Result<(), Error> {