Robot
/
bat
mirror of https://github.com/sharkdp/bat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add proper handling of empty PAGER variables

This commit is contained in:
sharkdp 2018-10-17 20:31:22 +02:00 committed by David Peter
parent 2109a7830b
commit bb1f5aa841
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/output.rs
View File

@ -33,29 +33,34 @@ impl OutputType {
let pagerflags = shell_words::split(&pager) let pagerflags = shell_words::split(&pager)
.chain_err(|| "Could not parse (BAT_)PAGER environment variable.")?; .chain_err(|| "Could not parse (BAT_)PAGER environment variable.")?;
let less_path = PathBuf::from(&pagerflags[0]); match pagerflags.split_first() {
let is_less = less_path.file_stem() == Some(&OsString::from("less")); Some((pager_name, args)) => {
let pager_path = PathBuf::from(pager_name);
let is_less = pager_path.file_stem() == Some(&OsString::from("less"));
let mut process = if is_less { let mut process = if is_less {
let mut p = Command::new(&less_path); let mut p = Command::new(&pager_path);
if pagerflags.len() == 1 { if pagerflags.len() == 1 {
p.args(vec!["--RAW-CONTROL-CHARS", "--no-init"]); p.args(vec!["--RAW-CONTROL-CHARS", "--no-init"]);
if quit_if_one_screen { if quit_if_one_screen {
p.arg("--quit-if-one-screen"); p.arg("--quit-if-one-screen");
} }
}
p.env("LESSCHARSET", "UTF-8");
p
} else {
Command::new(&pager_path)
};
Ok(process
.args(args)
.stdin(Stdio::piped())
.spawn()
.map(OutputType::Pager)
.unwrap_or_else(|_| OutputType::stdout()))
} }
p.env("LESSCHARSET", "UTF-8"); None => Ok(OutputType::stdout()),
p }
} else {
Command::new(&less_path)
};
Ok(process
.args(&pagerflags[1..])
.stdin(Stdio::piped())
.spawn()
.map(OutputType::Pager)
.unwrap_or_else(|_| OutputType::stdout()))
} }
fn stdout() -> Self { fn stdout() -> Self {