From 7257845abf1d48c070ed2402b9ac53712e7f8c41 Mon Sep 17 00:00:00 2001
From: Denis Isidoro <denisidoro@users.noreply.github.com>
Date: Tue, 15 Jun 2021 10:08:07 -0300
Subject: [PATCH] Fix preview-var when using fish (#567)

---
 src/actor.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/actor.rs b/src/actor.rs
index abbf41f4..dc6fe7a4 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -77,6 +77,8 @@ fn prompt_finder(
 
     let exe = fs::exe_string();
 
+    let subshell_prefix = if CONFIG.shell().contains("fish") { "" } else { "$" };
+
     let preview = if cfg!(target_os = "windows") {
         format!(
             r#"(@echo.{{+}}{eof}{{q}}{eof}{name}{eof}{extra}) | {exe} preview-var-stdin"#,
@@ -87,15 +89,16 @@ fn prompt_finder(
         )
     } else {
         format!(
-            r#"{exe} preview-var "$(cat <<{eof}
+            r#"{exe} preview-var "{subshell_prefix}(cat <<{eof}
 {{+}}
 {eof}
-)" "$(cat <<{eof}
+)" "{subshell_prefix}(cat <<{eof}
 {{q}}
 {eof}
 )" "{name}"; {extra}"#,
             exe = exe,
             name = variable_name,
+            subshell_prefix = subshell_prefix,
             extra = extra_preview
                 .clone()
                 .map(|e| format!(" echo; {}", e))