MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-02-21 12:28:30 +00:00
Code Issues Releases Wiki Activity

src/output.rs: Handle less in a portable way.

Browse Source
This commit is contained in:
Aankhen 2018-09-06 19:11:38 +05:30 committed by David Peter
parent 97efd75cee
commit 76df41fa97
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/output.rs
View File

@ -1,5 +1,7 @@
use std::env; use std::env;
use std::ffi::OsString;
use std::io::{self, Write}; use std::io::{self, Write};
use std::path::PathBuf;
use std::process::{Child, Command, Stdio}; use std::process::{Child, Command, Stdio};
use app::PagingMode; use app::PagingMode;
@ -26,13 +28,16 @@ impl OutputType {
.or_else(|_| env::var("PAGER")) .or_else(|_| env::var("PAGER"))
.unwrap_or(String::from("less")); .unwrap_or(String::from("less"));
let mut process = if pager == "less" || pager.ends_with("/less") { let less_path = PathBuf::from(&pager);
let is_less = less_path.file_stem() == Some(&OsString::from("less"));
let mut process = if is_less {
let mut args = vec!["--RAW-CONTROL-CHARS", "--no-init"]; let mut args = vec!["--RAW-CONTROL-CHARS", "--no-init"];
if quit_if_one_screen { if quit_if_one_screen {
args.push("--quit-if-one-screen"); args.push("--quit-if-one-screen");
} }
let mut p = Command::new("less"); let mut p = Command::new(&less_path);
p.args(&args).env("LESSCHARSET", "UTF-8"); p.args(&args).env("LESSCHARSET", "UTF-8");
p p
} else { } else {