From 9d18f97327e94ecf6fd0ae7b75a88abfeac07d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Sun, 30 Jun 2019 19:32:24 +0200
Subject: fix: normalize Deno.execPath (#2598)

---
 cli/ops.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'cli/ops.rs')

diff --git a/cli/ops.rs b/cli/ops.rs
index bf4016366..0664d8077 100644
--- a/cli/ops.rs
+++ b/cli/ops.rs
@@ -57,6 +57,7 @@ use tokio::net::TcpListener;
 use tokio::net::TcpStream;
 use tokio_process::CommandExt;
 use tokio_threadpool;
+use url::Url;
 use utime;
 
 #[cfg(unix)]
@@ -345,8 +346,12 @@ fn op_start(
   let cwd_off =
     builder.create_string(deno_fs::normalize_path(cwd_path.as_ref()).as_ref());
 
+  let current_exe = std::env::current_exe().unwrap();
+  // Now apply URL parser to current exe to get fully resolved path, otherwise we might get
+  // `./` and `../` bits in `exec_path`
+  let exe_url = Url::from_file_path(current_exe).unwrap();
   let exec_path =
-    builder.create_string(std::env::current_exe().unwrap().to_str().unwrap());
+    builder.create_string(exe_url.to_file_path().unwrap().to_str().unwrap());
 
   let v8_version = version::v8();
   let v8_version_off = builder.create_string(v8_version);
-- 
cgit v1.2.3