dependencies: Update shellexpand to 3.0.0

This commit is contained in:
2022-12-12 13:55:05 +01:00
parent 8ce5cfecd4
commit 3151b97bc0
4 changed files with 12 additions and 16 deletions

View File

@@ -240,7 +240,7 @@ impl Config {
pub fn normalize(&mut self) {
if let Config::ConfigTrees(config) = self {
let home = path::env_home().display().to_string();
let home = path::env_home();
for tree in &mut config.trees_mut().iter_mut() {
if tree.root.starts_with(&home) {
// The tilde is not handled differently, it's just a normal path component for `Path`.

View File

@@ -47,9 +47,9 @@ pub fn path_as_string(path: &Path) -> String {
path.to_path_buf().into_os_string().into_string().unwrap()
}
pub fn env_home() -> PathBuf {
pub fn env_home() -> String {
match std::env::var("HOME") {
Ok(path) => Path::new(&path).to_path_buf(),
Ok(path) => path,
Err(e) => {
print_error(&format!("Unable to read HOME: {}", e));
process::exit(1);
@@ -58,16 +58,12 @@ pub fn env_home() -> PathBuf {
}
pub fn expand_path(path: &Path) -> PathBuf {
fn home_dir() -> Option<PathBuf> {
Some(env_home())
}
let expanded_path = match shellexpand::full_with_context(
&path_as_string(path),
home_dir,
|| Some(env_home()),
|name| -> Result<Option<String>, &'static str> {
match name {
"HOME" => Ok(Some(path_as_string(home_dir().unwrap().as_path()))),
"HOME" => Ok(Some(env_home())),
_ => Ok(None),
}
},