025c5c0 · bat · git.iko.soy

Make less version check accept a path to the less binary

commit025c5c061b8b79609e87e58d74858e9b90fc1458 authorEthan P <eth-p+git@hidden.email> dateSun 10 Jan 2021, 13:49 (6 years ago) parent573f34d

2 files changed+5−4

unifiedsplit

src/less.rs+3−2

@@ -1,9 +1,10 @@

11#![cfg(feature = "paging")]

3+use std::ffi::OsStr;

34use std::process::Command;

5−pub fn retrieve_less_version() -> Option<usize> {

6− let cmd = Command::new("less").arg("--version").output().ok()?;

6+pub fn retrieve_less_version(less_path: &dyn AsRef<OsStr>) -> Option<usize> {

7+ let cmd = Command::new(less_path).arg("--version").output().ok()?;

78 parse_less_version(&cmd.stdout)

89}

910

src/output.rs+2−2

@@ -63,7 +63,7 @@ impl OutputType {

6363 return Err(ErrorKind::InvalidPagerValueBat.into());

6464 }

6565

66− let mut p = Command::new(pager.bin);

66+ let mut p = Command::new(&pager.bin);

6767 let args = pager.args;

6868

6969 if pager.kind == PagerKind::Less {

@@ -92,7 +92,7 @@ impl OutputType {

9292 //

9393 // For newer versions (530 or 558 on Windows), we omit '--no-init' as it

9494 // is not needed anymore.

95− match retrieve_less_version() {

95+ match retrieve_less_version(&pager.bin) {

9696 None => {

9797 p.arg("--no-init");

9898 }