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

refactor(zplug): remove match expressions

Browse Source
This commit is contained in:
Eric Mark Martin
2019-02-26 03:14:40 -08:00
parent 6003ffc83c
commit 79cb5a5284
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,20 +8,15 @@ use std::path::Path;
use std::process::Command;
fn zplug_exists(base_dirs: &BaseDirs) -> bool {
let home_exists = match env::var("ZPLUG_HOME") {
Ok(ref zplug_home) => Path::new(zplug_home).exists(),
Err(_) => false,
};
let dotdir_exists = base_dirs.home_dir().join(".zplug").exists();
home_exists || dotdir_exists
env::var("ZPLUG_HOME")
.map(|ref zplug_home| Path::new(zplug_home).exists())
.map(|p| p || base_dirs.home_dir().join("zplug").exists())
.unwrap_or(false)
}
fn get_zshrc(base_dirs: &BaseDirs) -> Result<String, ()> {
let zshrc = match env::var("ZDOTDIR") {
Ok(ref zdotdir) => Ok(Path::new(zdotdir).join(".zshrc")),
Err(_) => Err(()),
};
zshrc
env::var("ZDOTDIR")
.map(|ref zdotdir| Path::new(zdotdir).join(".zshrc"))
.unwrap_or_else(|_| base_dirs.home_dir().join(".zshrc"))
.to_str()
.map(|s| s.to_owned())