mirror of
https://github.com/sharkdp/bat.git
synced 2024-09-29 14:11:29 +02:00
Add proper handling of empty PAGER variables
This commit is contained in:
parent
2109a7830b
commit
bb1f5aa841
@ -33,11 +33,13 @@ 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 {
|
||||||
@ -47,16 +49,19 @@ impl OutputType {
|
|||||||
p.env("LESSCHARSET", "UTF-8");
|
p.env("LESSCHARSET", "UTF-8");
|
||||||
p
|
p
|
||||||
} else {
|
} else {
|
||||||
Command::new(&less_path)
|
Command::new(&pager_path)
|
||||||
};
|
};
|
||||||
|
|
||||||
Ok(process
|
Ok(process
|
||||||
.args(&pagerflags[1..])
|
.args(args)
|
||||||
.stdin(Stdio::piped())
|
.stdin(Stdio::piped())
|
||||||
.spawn()
|
.spawn()
|
||||||
.map(OutputType::Pager)
|
.map(OutputType::Pager)
|
||||||
.unwrap_or_else(|_| OutputType::stdout()))
|
.unwrap_or_else(|_| OutputType::stdout()))
|
||||||
}
|
}
|
||||||
|
None => Ok(OutputType::stdout()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn stdout() -> Self {
|
fn stdout() -> Self {
|
||||||
OutputType::Stdout(io::stdout())
|
OutputType::Stdout(io::stdout())
|
||||||
|
Loading…
Reference in New Issue
Block a user