source ~/.jq file on windows (fixes #3104) #3114
Merged
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
wader
reviewed
May 8, 2024
|
Possible to add a test for this? we have some $HOME related tests here https://github.com/jqlang/jq/blob/master/tests/shtest#L355 but not sure how messy to emulate a more normal windows env? Otherwise code change look fine with me and thanks for looking into this! |
|
Ok yeah I did see those tests and briefly puzzled over them running in an msys environment. I will see if I can get at least something simple in there exercising the |
ab33e86
to
4396b78
Compare
wader
reviewed
May 9, 2024
|
Test added (after some minor flopping and twitching). |
wader
approved these changes
May 10, 2024
|
@kirkoman Could you rebase the changes? The dev manual should be updated. |
|
Forced pushed conflict fix (felt guilty as i was the one who moved the file) |
|
Thanks! |
|
Sorry wasn't tuned in. Thanks for the rebase and the merge! |
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.
Sourcing of
~/.jq(file) was hardwired to use theHOMEenvironment variable, which is not defined when running in a native Windows shell (PowerShell, CMD). This change lets it check theUSERPROFILEenvironment variable and other standard fallbacks.HOMEstill has priority if it is set (e.g., in MSYS2 shell).