extern/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-08-17 03:23:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

When PAGER=most, don't print a warning to stderr, silently use less instead

Browse Source
This commit is contained in:
Martin Nordholts
2020-12-30 08:11:44 +01:00
parent 552545fe5f
commit 22bdc7c20f
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/output.rs
View File

@ -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"));