holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix path-related parts of value shell

Browse Source
This commit is contained in:
Jonathan Turner 2019-08-27 17:15:05 +12:00
parent 1d64d90419
commit 570a0ac275
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/shell/value_shell.rs
View File

@ -84,19 +84,20 @@ impl Shell for ValueShell {
let path = match args.nth(0) { let path = match args.nth(0) {
None => "/".to_string(), None => "/".to_string(),
Some(v) => { Some(v) => {
let target = v.as_string()?; let target = v.as_path()?;
let mut cwd = PathBuf::from(&self.path); let mut cwd = PathBuf::from(&self.path);
match target {
x if x == ".." => { if target == PathBuf::from("..") {
cwd.pop(); cwd.pop();
} } else {
_ => match target.chars().nth(0) { match target.to_str() {
Some(target) => match target.chars().nth(0) {
Some(x) if x == '/' => cwd = PathBuf::from(target), Some(x) if x == '/' => cwd = PathBuf::from(target),
_ => { _ => cwd.push(target),
cwd.push(target);
}
}, },
None => cwd.push(target),
}
} }
cwd.to_string_lossy().to_string() cwd.to_string_lossy().to_string()
} }