Recognize $BAT_CONFIG_DIR and give it precedence over $XDG_CONFIG_HOME #1797
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
billrisher
commented
Aug 13, 2021
keith-hall
approved these changes
Aug 14, 2021
sharkdp
reviewed
Aug 14, 2021
| @@ -747,6 +747,25 @@ fn config_location_when_generating() { | |||
| assert!(tmp_config_path.exists()); | |||
| } | |||
|
|
|||
| #[test] | |||
There was a problem hiding this comment.
Can you please add the new env. variable to bat_raw_command_with_config to make sure it is removed from the environment for all integration tests? This is important in order to make sure that (all) tests pass, even in environments where a user has set some env. variables.
sharkdp
reviewed
Aug 14, 2021
tests/integration_tests.rs
Outdated
Comment on lines
754
to
763
| // Create file at BAT_CONFIG_DIR | ||
| bat_with_config() | ||
| .env("BAT_CONFIG_DIR", bat_conf_dir.to_str().unwrap()) | ||
| .arg("--generate-config-file") | ||
| .assert() | ||
| .success() | ||
| .stdout( | ||
| predicate::str::is_match("Success! Config file written to .*config\n") | ||
| .unwrap() | ||
| ); |
There was a problem hiding this comment.
Another idea for a (maybe simpler) test would be similar to config_read_arguments_from_file. Wouldn't require a temp. directory. But I guess this is fine as well. Thank you for writing a test!
sharkdp
reviewed
Aug 14, 2021
CHANGELOG.md
Outdated
| @@ -2,6 +2,7 @@ | |||
|
|
|||
| ## Features | |||
|
|
|||
| - $BAT_CONFIG_DIR is now a recognized environment variable and has precedent over $XDG_CONFIG_HOME. (@billrisher) | |||
There was a problem hiding this comment.
Suggested change
| - $BAT_CONFIG_DIR is now a recognized environment variable and has precedent over $XDG_CONFIG_HOME. (@billrisher) | |
| - `$BAT_CONFIG_DIR` is now a recognized environment variable. It has precedence over `$XDG_CONFIG_HOME`, see #1727 (@billrisher) |
sharkdp
requested changes
Aug 14, 2021
sharkdp
approved these changes
Aug 14, 2021
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.
This PR closes issue #1727
I added a nearly-identical test case to one that already exists, for verbosity's sake I left it there but I understand if we'd want to wrap the new test case into an existing one.