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

Merge pull request #328 from androbtech/back-to-shellmanager

Browse Source 
Leave Nu's shell manager to figure out the suitable path for us instead.
This commit is contained in:
Jonathan Turner 2019-08-22 04:57:15 +12:00 committed by GitHub
commit 990c0cc28b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/commands/cp.rs
View File

@ -45,11 +45,15 @@ fn cp(
dst, dst,
recursive, recursive,
}: CopyArgs, }: CopyArgs,
RunnablePerItemContext { name, .. }: &RunnablePerItemContext, context: &RunnablePerItemContext,
) -> Result<VecDeque<ReturnValue>, ShellError> { ) -> Result<VecDeque<ReturnValue>, ShellError> {
let source = src.item.clone(); let name_span = context.name;
let mut destination = dst.item.clone();
let name_span = name; let mut source = PathBuf::from(context.shell_manager.path());
let mut destination = PathBuf::from(context.shell_manager.path());
source.push(&src.item);
destination.push(&dst.item);
let sources: Vec<_> = match glob::glob(&source.to_string_lossy()) { let sources: Vec<_> = match glob::glob(&source.to_string_lossy()) {
Ok(files) => files.collect(), Ok(files) => files.collect(),

19
src/commands/mv.rs
View File

@ -38,14 +38,15 @@ impl PerItemCommand for Move {
fn mv( fn mv(
MoveArgs { src, dst }: MoveArgs, MoveArgs { src, dst }: MoveArgs,
RunnablePerItemContext { context: &RunnablePerItemContext,
name,
shell_manager,
}: &RunnablePerItemContext,
) -> Result<VecDeque<ReturnValue>, ShellError> { ) -> Result<VecDeque<ReturnValue>, ShellError> {
let source = src.item.clone(); let name_span = context.name;
let mut destination = dst.item.clone();
let name_span = name; let mut source = PathBuf::from(context.shell_manager.path());
let mut destination = PathBuf::from(context.shell_manager.path());
source.push(&src.item);
destination.push(&dst.item);
let sources: Vec<_> = match glob::glob(&source.to_string_lossy()) { let sources: Vec<_> = match glob::glob(&source.to_string_lossy()) {
Ok(files) => files.collect(), Ok(files) => files.collect(),
@ -58,10 +59,6 @@ fn mv(
} }
}; };
if "." == destination.to_string_lossy() {
destination = PathBuf::from(shell_manager.path());
}
let destination_file_name = { let destination_file_name = {
match destination.file_name() { match destination.file_name() {
Some(name) => PathBuf::from(name), Some(name) => PathBuf::from(name),