summaryrefslogtreecommitdiffstats
path: root/src/bat_utils/less.rs
diff options
context:
space:
mode:
authorDan Davison <dandavison7@gmail.com>2021-07-10 15:52:06 +0100
committerGitHub <noreply@github.com>2021-07-10 15:52:06 +0100
commitf01846bd443aaf92fdd5ac20f461beac3f6ee3fd (patch)
treec149a80974da3d6d90e88c63019846202bf58461 /src/bat_utils/less.rs
parent2826bdd75b31f42aac1c80b2302c25e739a8adf1 (diff)
Do not resolve executables as relative path from current directory (#658)0.8.3
* Refactor: child pager process creation * Protect calls to Command::new behind grep_cli::resolve_binary * Move less env-var setting into less-specific branch
Diffstat (limited to 'src/bat_utils/less.rs')
-rw-r--r--src/bat_utils/less.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/bat_utils/less.rs b/src/bat_utils/less.rs
index 79ecd43b..1ca9f76f 100644
--- a/src/bat_utils/less.rs
+++ b/src/bat_utils/less.rs
@@ -1,8 +1,12 @@
use std::process::Command;
pub fn retrieve_less_version() -> Option<usize> {
- let cmd = Command::new("less").arg("--version").output().ok()?;
- parse_less_version(&cmd.stdout)
+ if let Ok(less_path) = grep_cli::resolve_binary("less") {
+ let cmd = Command::new(less_path).arg("--version").output().ok()?;
+ parse_less_version(&cmd.stdout)
+ } else {
+ None
+ }
}
fn parse_less_version(output: &[u8]) -> Option<usize> {