diff options
Diffstat (limited to 'cli/tools')
| -rw-r--r-- | cli/tools/installer.rs | 3 | ||||
| -rw-r--r-- | cli/tools/standalone.rs | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cli/tools/installer.rs b/cli/tools/installer.rs index 344758590..2d2584f54 100644 --- a/cli/tools/installer.rs +++ b/cli/tools/installer.rs @@ -1,6 +1,7 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. use crate::args::resolve_no_prompt; +use crate::args::CaData; use crate::args::ConfigFlag; use crate::args::Flags; use crate::args::InstallFlags; @@ -325,7 +326,7 @@ fn resolve_shim_data( executable_args.push("--location".to_string()); executable_args.push(url.to_string()); } - if let Some(ca_file) = &flags.ca_file { + if let Some(CaData::File(ca_file)) = &flags.ca_data { executable_args.push("--cert".to_string()); executable_args.push(ca_file.to_owned()) } diff --git a/cli/tools/standalone.rs b/cli/tools/standalone.rs index b5738654a..8b99b8874 100644 --- a/cli/tools/standalone.rs +++ b/cli/tools/standalone.rs @@ -1,5 +1,6 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. +use crate::args::CaData; use crate::args::CompileFlags; use crate::args::Flags; use crate::cache::DenoDir; @@ -158,10 +159,11 @@ async fn create_standalone_binary( ) -> Result<Vec<u8>, AnyError> { let mut eszip_archive = eszip.into_bytes(); - let ca_data = match ps.options.ca_file() { - Some(ca_file) => { + let ca_data = match ps.options.ca_data() { + Some(CaData::File(ca_file)) => { Some(fs::read(ca_file).with_context(|| format!("Reading: {}", ca_file))?) } + Some(CaData::Bytes(bytes)) => Some(bytes.clone()), None => None, }; let maybe_import_map: Option<(Url, String)> = |