[Fix] Improve .nvmrc reading process #1740
Merged
Conversation
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
Fixes nvm-sh#1015. Fixes nvm-sh#1712.
ljharb
requested changes
Feb 21, 2018
nvm.sh
Outdated
| @@ -293,7 +293,7 @@ nvm_rc_version() { | |||
| nvm_err "No .nvmrc file found" | |||
| return 1 | |||
| fi | |||
| read -r NVM_RC_VERSION < "${NVMRC_PATH}" || printf '' | |||
| NVM_RC_VERSION="$(command head -n 1 "${NVMRC_PATH}" | command tr -d '\r')" || printf '' | |||
ljharb
changed the title
PeterDaveHello
force-pushed
the
handle-cr-char-in-nvmrc
branch
2 times, most recently
from
bba70f5 to
7984305
Compare
ljharb
reviewed
Feb 24, 2018
| \. ../../nvm.sh | ||
|
|
||
| # normal .nvmrc | ||
| printf '0.999.0\n' > .nvmrc |
There was a problem hiding this comment.
should we also add an example that has no newline?
PeterDaveHello
force-pushed
the
handle-cr-char-in-nvmrc
branch
from
7984305 to
787bbe3
Compare
ljharb
approved these changes
Feb 25, 2018
|
Great, let's hope to get it done soon! |
|
I tested this out with both linux new lines and windows new lines and it seemed to have worked! |
|
I hope > 1.5 months bake is good enough now :) |
ljharb
force-pushed
the
handle-cr-char-in-nvmrc
branch
from
787bbe3 to
e7b4219
Compare
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.
Improve how we read the version in
.nvmrcto avoid the impact ofCR/CRLFas newline char.Fixes #1015. Fixes #1712.