@@ -1,5 +1,7 @@
11use std::env;
2+use std::ffi::OsString;
23use std::io::{self, Write};
4+use std::path::PathBuf;
35use std::process::{Child, Command, Stdio};
46
57use app::PagingMode;
@@ -26,13 +28,16 @@ impl OutputType {
2628 .or_else(|_| env::var("PAGER"))
2729 .unwrap_or(String::from("less"));
2830
29− let mut process = if pager == "less" || pager.ends_with("/less") {
31+ let less_path = PathBuf::from(&pager);
32+ let is_less = less_path.file_stem() == Some(&OsString::from("less"));
33+
34+ let mut process = if is_less {
3035 let mut args = vec!["--RAW-CONTROL-CHARS", "--no-init"];
3136 if quit_if_one_screen {
3237 args.push("--quit-if-one-screen");
3338 }
3439
35− let mut p = Command::new("less");
40+ let mut p = Command::new(&less_path);
3641 p.args(&args).env("LESSCHARSET", "UTF-8");
3742 p
3843 } else {