git.iko.soy/bat
on master help sign in
Do not ignore non-existent BAT_CONFIG_PATH

Do not ignore `BAT_CONFIG_PATH` if it doesn't exist. Both when generating a new config file with `--generate-config-file` and when attempting to read the config. Also, provide a better error message in case the file can not be created. closes #1550

commitca60937c2e0b6b3de3d3e379fd419cdac9daecd6 authorDavid Peter <mail@david-peter.de> dateSat 27 Feb 2021, 12:21 (6 years ago) parent2aa3ed9
3 files changed+17−3
compare with master
unifiedsplit
CHANGELOG.md+1 src/bin/bat/config.rs+9−3 tests/integration_tests.rs+7
CHANGELOG.md+1
@@ -16,6 +16,7 @@
1616- If `PAGER` (but not `BAT_PAGER` or `--pager`) is `more` or `most`, silently use `less` instead to ensure support for colors, see #1063 (@Enselic)
1717- If `PAGER` is `bat`, silently use `less` to prevent recursion. For `BAT_PAGER` or `--pager`, exit with error, see #1413 (@Enselic)
1818- Manpage highlighting fix, see #1511 (@keith-hall)
19+- `BAT_CONFIG_PATH` ignored by `bat` if non-existent, see #1550 (@sharkdp)
1920
2021## Other
2122
src/bin/bat/config.rs+9−3
@@ -10,13 +10,12 @@ pub fn config_file() -> PathBuf {
1010 env::var("BAT_CONFIG_PATH")
1111 .ok()
1212 .map(PathBuf::from)
13− .filter(|config_path| config_path.is_file())
1413 .unwrap_or_else(|| PROJECT_DIRS.config_dir().join("config"))
1514}
1615
1716pub fn generate_config_file() -> bat::error::Result<()> {
1817 let config_file = config_file();
19− if config_file.exists() {
18+ if config_file.is_file() {
2019 println!(
2120 "A config file already exists at: {}",
2221 config_file.to_string_lossy()
@@ -71,7 +70,14 @@ pub fn generate_config_file() -> bat::error::Result<()> {
7170#--map-syntax ".ignore:Git Ignore"
7271"#;
7372
74− fs::write(&config_file, default_config)?;
73+ fs::write(&config_file, default_config).map_err(|e| {
74+ format!(
75+ "Failed to create config file at '{}': {}",
76+ config_file.to_string_lossy(),
77+ e
78+ )
79+ })?;
80+
7581 println!(
7682 "Success! Config file written to {}",
7783 config_file.to_string_lossy()
tests/integration_tests.rs+7
@@ -652,6 +652,13 @@ fn config_location_test() {
652652 .assert()
653653 .success()
654654 .stdout("bat.conf\n");
655+
656+ bat_with_config()
657+ .env("BAT_CONFIG_PATH", "not-existing.conf")
658+ .arg("--config-file")
659+ .assert()
660+ .success()
661+ .stdout("not-existing.conf\n");
655662}
656663
657664#[test]