Support copying windows files with spaces#34
Open
ArtsiomMusin wants to merge 4 commits intonet-ssh:masterfrom
Open
Support copying windows files with spaces#34ArtsiomMusin wants to merge 4 commits intonet-ssh:masterfrom
ArtsiomMusin wants to merge 4 commits intonet-ssh:masterfrom
Conversation
Conflicts: lib/net/scp.rb
… windows openssh versions
mfazekas
reviewed
Mar 1, 2019
| if options[:shell] | ||
| escaped_file = shellescape(remote).gsub(/'/) { |m| "'\\''" } | ||
| command = "#{options[:shell]} -c '#{scp_command(mode, options)} #{escaped_file}'" | ||
| if options[:windows_path] |
Collaborator
There was a problem hiding this comment.
I assume :windows_path is a new option. Does it means that the remote uses windows style encoding?
swiknaba
reviewed
Apr 1, 2019
| command = "#{scp_command(mode, options)} #{remote.gsub('\\', '/')}" | ||
| else | ||
| command = "#{scp_command(mode, options)} #{shellescape remote}" | ||
| if options[:shell] |
There was a problem hiding this comment.
elsif options[:shell] for readability? 🙂
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Some people like me use net-scp with Win32-OpenSSH... but scp doesn't work as a windows path could like this "C:\Program Files\Some folder".
The current code uses shellescape which is not friendly with windows paths. That is, every space(and maybe other chars) will be replaced with '\ ' which breaks the windows path. Moreover, net-scp doesn't expect a trailing \ in the path. So all windows \ should be replaced with /.
We've been using this change for a while and haven't seen any issues so far. Hopefully, this change will be useful for other windows folks.