extern/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2024-11-08 00:44:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ignore PAGER=most by default with a warning to stderr

Browse Source 
closes #1063
This commit is contained in:
Martin Nordholts 2020-11-27 06:47:46 +01:00
parent f4202361b4
commit 986d0e9777
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -5,6 +5,8 @@
## Bugfixes
- Ignore PAGER=most by default with a warning to stderr, but allow override with BAT_PAGER or --config, see #1063 (@Enselic)
## Other
## Syntaxes

5
src/output.rs
View File

@ -66,6 +66,11 @@ impl OutputType {
return Err(ErrorKind::InvalidPagerValueBat.into());
}
if pager_path.file_stem() == Some(&OsString::from("most")) && source == PagerSource::PagerEnvVar {
eprintln!("WARNING: Ignoring PAGER=\"{}\": Coloring not supported. Override with BAT_PAGER=\"{}\" or --pager \"{}\"", pager, pager, pager);
return Ok(OutputType::stdout());
}
let is_less = pager_path.file_stem() == Some(&OsString::from("less"));
let mut process = if is_less {

24
tests/integration_tests.rs
View File

@ -415,6 +415,30 @@ fn pager_value_bat() {
.failure();
}
#[test]
fn pager_most() {
bat()
.env("PAGER", "most")
.arg("--paging=always")
.arg("test.txt")
.assert()
.success()
.stderr(predicate::eq("WARNING: Ignoring PAGER=\"most\": Coloring not supported. Override with BAT_PAGER=\"most\" or --pager \"most\"\n").normalize())
.stdout(predicate::eq("hello world\n").normalize());
}
#[test]
fn pager_most_with_arg() {
bat()
.env("PAGER", "most -w")
.arg("--paging=always")
.arg("test.txt")
.assert()
.success()
.stderr(predicate::eq("WARNING: Ignoring PAGER=\"most -w\": Coloring not supported. Override with BAT_PAGER=\"most -w\" or --pager \"most -w\"\n").normalize())
.stdout(predicate::eq("hello world\n").normalize());
}
#[test]
fn alias_pager_disable() {
bat()