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

Leave Nu's shell manager to figure out the suitable path for us instead.

Browse Source
This commit is contained in:
Andrés N. Robalino 2019-08-21 11:23:26 -05:00
parent 9b1034074a
commit c2b377eedc
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,
recursive,
}: CopyArgs,
RunnablePerItemContext { name, .. }: &RunnablePerItemContext,
context: &RunnablePerItemContext,
) -> Result<VecDeque<ReturnValue>, ShellError> {
let source = src.item.clone();
let mut destination = dst.item.clone();
let name_span = name;
let name_span = context.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()) {
Ok(files) => files.collect(),

19
src/commands/mv.rs
View File

@ -38,14 +38,15 @@ impl PerItemCommand for Move {
fn mv(
MoveArgs { src, dst }: MoveArgs,
RunnablePerItemContext {
name,
shell_manager,
}: &RunnablePerItemContext,
context: &RunnablePerItemContext,
) -> Result<VecDeque<ReturnValue>, ShellError> {
let source = src.item.clone();
let mut destination = dst.item.clone();
let name_span = name;
let name_span = context.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()) {
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 = {
match destination.file_name() {
Some(name) => PathBuf::from(name),