From 8a0c30b385151698311b683c4c065f5042c5021f Mon Sep 17 00:00:00 2001 From: Rodrigo Orem <8618619+rodorgas@users.noreply.github.com> Date: Wed, 31 Oct 2018 20:22:56 -0300 Subject: [PATCH] Avoid endless bat executions with PAGER="bat" From issue #383 --- src/output.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/output.rs b/src/output.rs index be0d4af1..c7a77758 100644 --- a/src/output.rs +++ b/src/output.rs @@ -27,11 +27,16 @@ impl OutputType { /// Try to launch the pager. Fall back to stdout in case of errors. fn try_pager(quit_if_one_screen: bool, pager_from_config: Option<&str>) -> Result { let pager_from_env = env::var("BAT_PAGER").or_else(|_| env::var("PAGER")); - let pager = pager_from_config + + let mut pager = pager_from_config .map(|p| p.to_string()) .or(pager_from_env.ok()) .unwrap_or(String::from("less")); + if pager == "bat" { + pager = String::from("less"); + } + let pagerflags = shell_words::split(&pager) .chain_err(|| "Could not parse (BAT_)PAGER environment variable.")?;