diff options
author | Martin Nordholts <enselic@gmail.com> | 2020-12-30 08:11:44 +0100 |
---|---|---|
committer | Martin Nordholts <enselic@gmail.com> | 2020-12-30 08:25:39 +0100 |
commit | 22bdc7c20f21108ddc7be18775a8050059459ebf (patch) | |
tree | 9ceb5fa8e6d805dbb88fec4526f39ed485c9f43b /src | |
parent | 552545fe5f807f7fca51ab5a52cebcd15dd0021a (diff) |
When PAGER=most, don't print a warning to stderr, silently use less instead
Diffstat (limited to 'src')
-rw-r--r-- | src/output.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/output.rs b/src/output.rs index ce311fe1..ed636cc4 100644 --- a/src/output.rs +++ b/src/output.rs @@ -52,7 +52,6 @@ impl OutputType { use std::path::PathBuf; use std::process::{Command, Stdio}; use crate::pager::*; - use crate::bat_warning; let Pager { pager, source } = get_pager(pager_from_config); @@ -60,16 +59,18 @@ impl OutputType { shell_words::split(&pager).chain_err(|| "Could not parse pager command.")?; match pagerflags.split_first() { - Some((pager_name, args)) => { - let pager_path = PathBuf::from(pager_name); + Some((pager_name, pager_args)) => { + let mut pager_path = PathBuf::from(pager_name); + let mut args = pager_args; + let empty_args = vec![]; if pager_path.file_stem() == Some(&OsString::from("bat")) { return Err(ErrorKind::InvalidPagerValueBat.into()); } if pager_path.file_stem() == Some(&OsString::from("most")) && source == PagerSource::PagerEnvVar { - bat_warning!("Ignoring PAGER=\"{}\": Coloring not supported. Override with BAT_PAGER=\"{}\" or --pager \"{}\"", pager, pager, pager); - return Ok(OutputType::stdout()); + pager_path = PathBuf::from("less"); + args = &empty_args; } let is_less = pager_path.file_stem() == Some(&OsString::from("less")); |