GetComponents: remove use of $orig_dir to support whitespace in it #2
Conversation
This file contains 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
Using $orig_dir in command expansions become very difficult once $orig_dir contains whitespace and single quotes eg "Roland's Documents". There is no real need to do so since it was just path to cwd() anyway. Another reason not to use it is that cwd() returns the actual path which can differ from what the shell shows if cwd() is a symbolic link.
|
Ticket is here: https://trac.einsteintoolkit.org/ticket/1972 |
knarrff
reviewed
Oct 10, 2016
| @@ -1376,7 +1372,7 @@ sub handle_git { | |||
| } | |||
| print_checkout_info( $checkout, $url, $target, $name ); | |||
|
|
|||
| run_command("mkdir -p $orig_dir/$ROOT/repos"); | |||
| run_command("mkdir -p $ROOT/repos"); | |||
There was a problem hiding this comment.
If $ROOT is set to cwd(), wouldn't this pose a similar problem with whitespace? Granted, ROOT is usually set to something by the thornlist, but it might not be, and would be cwd() as of line 387.
| @@ -385,7 +384,7 @@ sub parse_list { | |||
| } | |||
| # if $ROOT is undefined, it will be set to the current directory | |||
| if ( defined( $DEFINITIONS{ROOT} ) ) { $ROOT = $DEFINITIONS{ROOT} } | |||
| else { $ROOT = $orig_dir } | |||
| else { $ROOT = cwd() } | |||
There was a problem hiding this comment.
Wouldn't this be a problem as well in several places later, if cwd() contains spaces (see also comment below)?
There was a problem hiding this comment.
Right. So I should use "." instead of cwd(). I just tested this and indeed with cwd() I get errors if I remove the ROOT define from the ET thornlist but using "." works fine. I amended the pull request.
if ROOT is not defined it would still have been used
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Using $orig_dir in command expansions become very difficult once
$orig_dir contains whitespace and single quotes eg "Roland's Documents".
There is no real need to do so since it was just path to cwd() anyway.
Another reason not to use it is that cwd() returns the actual path which
can differ from what the shell shows if cwd() is a symbolic link.