MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-01-31 18:21:04 +00:00
Code Issues Releases Wiki Activity

issue #383: Handle cases like PAGER=/usr/bin/bat

Browse Source
This commit is contained in:
sharkdp 2018-11-06 19:53:32 +01:00
parent 148caa1381
commit 7cac07d845
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/output.rs
View File

@ -37,16 +37,14 @@ impl OutputType {
.chain_err(|| "Could not parse (BAT_)PAGER environment variable.")?; .chain_err(|| "Could not parse (BAT_)PAGER environment variable.")?;
match pagerflags.split_first() { match pagerflags.split_first() {
Some((initial_pager, mut args)) => { Some((pager_name, mut args)) => {
let pager_name; let mut pager_path = PathBuf::from(pager_name);
if initial_pager == "bat" {
pager_name = "less"; if pager_path.file_stem() == Some(&OsString::from("bat")) {
pager_path = PathBuf::from("less");
args = &[]; args = &[];
} else {
pager_name = initial_pager;
} }
let pager_path = PathBuf::from(pager_name);
let is_less = pager_path.file_stem() == Some(&OsString::from("less")); let is_less = pager_path.file_stem() == Some(&OsString::from("less"));
let mut process = if is_less { let mut process = if is_less {