summaryrefslogtreecommitdiff
path: root/cli/ops.rs
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2019-06-30 19:32:24 +0200
committerRyan Dahl <ry@tinyclouds.org>2019-06-30 13:32:24 -0400
commit9d18f97327e94ecf6fd0ae7b75a88abfeac07d7e (patch)
treed2583dd1d7c6da9e59a503dd7c3317cd2c6f7de6 /cli/ops.rs
parent1068b4848c4d6d9a444d2d2bca5f25d822c42ff5 (diff)
fix: normalize Deno.execPath (#2598)
Diffstat (limited to 'cli/ops.rs')
-rw-r--r--cli/ops.rs7
1 files changed, 6 insertions, 1 deletions
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);