From 3fa09dbe2e1755740eda1de0900853c4a6ee5f3a Mon Sep 17 00:00:00 2001
From: David Peter <mail@david-peter.de>
Date: Mon, 12 Jul 2021 22:03:22 +0200
Subject: Use resolved path for --diagnostic as well

---
 src/bin/bat/main.rs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/bin/bat/main.rs b/src/bin/bat/main.rs
index dadcc673..fb407b90 100644
--- a/src/bin/bat/main.rs
+++ b/src/bin/bat/main.rs
@@ -231,7 +231,7 @@ fn run() -> Result<bool> {
         let pager = bat::config::get_pager_executable(app.matches.value_of("pager"))
             .unwrap_or_else(|| "less".to_owned()); // FIXME: Avoid non-canonical path to "less".
 
-        bugreport!()
+        let report = bugreport!()
             .info(SoftwareVersion::default())
             .info(OperatingSystem::default())
             .info(CommandLine::default())
@@ -253,9 +253,19 @@ fn run() -> Result<bool> {
                 "MANPAGER",
             ]))
             .info(FileContent::new("Config file", config_file()))
-            .info(CompileTimeInformation::default())
-            .info(CommandOutput::new("Less version", pager, &["--version"]))
-            .print::<Markdown>();
+            .info(CompileTimeInformation::default());
+
+        let mut report = if let Ok(resolved_path) = grep_cli::resolve_binary(pager) {
+            report.info(CommandOutput::new(
+                "Less version",
+                resolved_path,
+                &["--version"],
+            ))
+        } else {
+            report
+        };
+
+        report.print::<Markdown>();
 
         return Ok(true);
     }
-- 
cgit v1.2.3