diff options
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/factory.rs | 5 | ||||
| -rw-r--r-- | cli/standalone/mod.rs | 9 | ||||
| -rw-r--r-- | cli/worker.rs | 12 |
3 files changed, 10 insertions, 16 deletions
diff --git a/cli/factory.rs b/cli/factory.rs index 9f3719510..22bc6cdaf 100644 --- a/cli/factory.rs +++ b/cli/factory.rs @@ -855,9 +855,10 @@ impl CliFactory { location: self.options.location_flag().clone(), // if the user ran a binary command, we'll need to set process.argv[0] // to be the name of the binary command instead of deno - maybe_binary_npm_command_name: self + argv0: self .options - .take_binary_npm_command_name(), + .take_binary_npm_command_name() + .or(std::env::args().next()), origin_data_folder_path: Some(self.deno_dir()?.origin_data_folder_path()), seed: self.options.seed(), unsafely_ignore_certificate_errors: self diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs index d1b90ecee..312a1841d 100644 --- a/cli/standalone/mod.rs +++ b/cli/standalone/mod.rs @@ -536,11 +536,10 @@ pub async fn run( is_npm_main: main_module.scheme() == "npm", skip_op_registration: true, location: metadata.location, - maybe_binary_npm_command_name: NpmPackageReqReference::from_specifier( - main_module, - ) - .ok() - .map(|req_ref| npm_pkg_req_ref_to_binary_command(&req_ref)), + argv0: NpmPackageReqReference::from_specifier(main_module) + .ok() + .map(|req_ref| npm_pkg_req_ref_to_binary_command(&req_ref)) + .or(std::env::args().next()), origin_data_folder_path: None, seed: metadata.seed, unsafely_ignore_certificate_errors: metadata diff --git a/cli/worker.rs b/cli/worker.rs index 5c252e92c..302303f28 100644 --- a/cli/worker.rs +++ b/cli/worker.rs @@ -115,7 +115,7 @@ pub struct CliMainWorkerOptions { pub is_inspecting: bool, pub is_npm_main: bool, pub location: Option<Url>, - pub maybe_binary_npm_command_name: Option<String>, + pub argv0: Option<String>, pub origin_data_folder_path: Option<PathBuf>, pub seed: Option<u64>, pub unsafely_ignore_certificate_errors: Option<Vec<String>>, @@ -608,10 +608,7 @@ impl CliMainWorkerFactory { user_agent: version::get_user_agent().to_string(), inspect: shared.options.is_inspecting, has_node_modules_dir: shared.options.has_node_modules_dir, - maybe_binary_npm_command_name: shared - .options - .maybe_binary_npm_command_name - .clone(), + argv0: shared.options.argv0.clone(), node_ipc_fd: shared.node_ipc, disable_deprecated_api_warning: shared.disable_deprecated_api_warning, verbose_deprecated_api_warning: shared.verbose_deprecated_api_warning, @@ -815,10 +812,7 @@ fn create_web_worker_callback( user_agent: version::get_user_agent().to_string(), inspect: shared.options.is_inspecting, has_node_modules_dir: shared.options.has_node_modules_dir, - maybe_binary_npm_command_name: shared - .options - .maybe_binary_npm_command_name - .clone(), + argv0: shared.options.argv0.clone(), node_ipc_fd: None, disable_deprecated_api_warning: shared.disable_deprecated_api_warning, verbose_deprecated_api_warning: shared.verbose_deprecated_api_warning, |