Prefer PWD environment variable over cwd if available to better support symbolic links (#783)

1 files changed, 2 insertions, 5 deletions

diff --git a/src/command/client/search.rs b/src/command/client/search.rs
index 3098267a..8d0e1de4 100644
--- a/src/command/client/search.rs
+++ b/src/command/client/search.rs
@@ -1,3 +1,4 @@
+use atuin_common::utils;
 use chrono::Utc;
 use clap::Parser;
 use eyre::Result;
@@ -137,11 +138,7 @@ async fn run_non_interactive(
     db: &mut impl Database,
 ) -> Result<usize> {
     let dir = if cwd.as_deref() == Some(".") {
-        let current = std::env::current_dir()?;
-        let current = current.as_os_str();
-        let current = current.to_str().unwrap();
-
-        Some(current.to_owned())
+        Some(utils::get_current_dir())
     } else {
         cwd
     };