From aba79f50d9f0a5ce5b6e5494e9889b67e023e5a5 Mon Sep 17 00:00:00 2001
From: Steffen Neubauer <steffen@garden.io>
Date: Mon, 6 Nov 2023 18:33:49 +0100
Subject: [PATCH] fix(garden-sea): resolve symlinks for
 GARDEN_SEA_EXECUTABLE_PATH (#5353)

This is to double down on making sure that self-update updates the
correct path (See also #5352)
---
 garden-sea/src/extract.rs |  2 +-
 garden-sea/src/node.rs    | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/garden-sea/src/extract.rs b/garden-sea/src/extract.rs
index cd233597e5..bf3ba31084 100644
--- a/garden-sea/src/extract.rs
+++ b/garden-sea/src/extract.rs
@@ -164,7 +164,7 @@ fn unpack(path: &Path, archive: &[u8]) -> Result<(), std::io::Error> {
 
 #[cfg(test)]
 mod tests {
-    use std::{path::PathBuf, fs};
+    use std::{fs, path::PathBuf};
 
     use super::extract_archives_if_needed;
 
diff --git a/garden-sea/src/node.rs b/garden-sea/src/node.rs
index c1a70edd38..257fd9f9f7 100644
--- a/garden-sea/src/node.rs
+++ b/garden-sea/src/node.rs
@@ -1,6 +1,7 @@
 use std::{
     env,
     ffi::OsString,
+    fs,
     path::Path,
     process::{Child, Command},
     thread::JoinHandle,
@@ -23,11 +24,12 @@ where
     // Some users depend on this, e.g. for NODE_EXTRA_CA_CERTS.
     let mut command = Command::new(path.join(node));
 
-    command.env("GARDEN_SEA_EXTRACTED_ROOT", OsString::from(path));
-    command.env(
-        "GARDEN_SEA_EXECUTABLE_PATH",
+    // Canonicalize resolves symlinks, which is important so self-update updates in the correct directory.
+    let executable_path = fs::canonicalize(
         process_path::get_executable_path().expect("Failed to get executable path"),
-    );
+    )?;
+    command.env("GARDEN_SEA_EXTRACTED_ROOT", OsString::from(path));
+    command.env("GARDEN_SEA_EXECUTABLE_PATH", executable_path);
 
     // Allow users to override the heap size if needed.
     let max_old_space_size = env::var("GARDEN_MAX_OLD_SPACE_SIZE").unwrap_or("4096".into());