mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix calling echo on linux

Browse source
This commit is contained in:
Nguyen Duc Toan 2023-10-03 04:16:27 +07:00 • committed by sxyazi
parent c480b31932
commit ba3a08403b
No known key found for this signature in database
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
shared/src/fns.rs
View file

@ -7,14 +7,14 @@ use crate::Url;
pub fn expand_path(p: impl AsRef<Path>) -> PathBuf { pub fn expand_path(p: impl AsRef<Path>) -> PathBuf {
let mut p = p.as_ref(); let mut p = p.as_ref();
// expand the environment variable by calling the "echo" command // expand the environment variable by calling the "echo" command, in linux case, this also expands the '~' path
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
let expanded_path = match std::process::Command::new("cmd").args(&["/C", "echo"]).arg(p).output() { let expanded_path = match std::process::Command::new("cmd").args(&["/C", "echo"]).arg(p).output() {
Ok(output) if output.status.success() => Some(String::from_utf8_lossy(&output.stdout).trim_end().to_string()), Ok(output) if output.status.success() => Some(String::from_utf8_lossy(&output.stdout).trim_end().to_string()),
_ => None, _ => None,
}; };
#[cfg(not(target_os = "windows"))] #[cfg(not(target_os = "windows"))]
let expanded_path = match std::process::Command::new("sh").args(&["-c", "echo"]).arg(p).output() { let expanded_path = match std::process::Command::new("sh").arg("-c").arg(format!("echo {}", p.display())).output() {
Ok(output) if output.status.success() => Some(String::from_utf8_lossy(&output.stdout).trim_end().to_string()), Ok(output) if output.status.success() => Some(String::from_utf8_lossy(&output.stdout).trim_end().to_string()),
_ => None, _ => None,
}; };
@ -23,13 +23,9 @@ pub fn expand_path(p: impl AsRef<Path>) -> PathBuf {
p = Path::new(s); p = Path::new(s);
} }
// support '~' on Windows
#[cfg(target_os = "windows")]
if let Ok(p) = p.strip_prefix("~") { if let Ok(p) = p.strip_prefix("~") {
#[cfg(not(target_os = "windows"))]
if let Some(home) = env::var_os("HOME") {
return PathBuf::from_iter([&home, p.as_os_str()]);
}
#[cfg(target_os = "windows")]
if let Ok(home) = env::var("USERPROFILE") { if let Ok(home) = env::var("USERPROFILE") {
return Path::new(&home).join(p); return Path::new(&home).join(p);
} }