Merge branch 'main' of gitlab.com:veilid/veilid into windows-fix

This commit is contained in:
John Smith 2023-08-20 11:27:18 -04:00
commit 76e7c74cc7

View File

@ -155,6 +155,7 @@ fn do_clap_matches(default_config_path: &OsStr) -> Result<clap::ArgMatches, clap
.arg( .arg(
Arg::new("network-key") Arg::new("network-key")
.long("network-key") .long("network-key")
.takes_value(true)
.help("password override to use for network isolation"), .help("password override to use for network isolation"),
) )
; ;
@ -264,7 +265,7 @@ pub fn process_command_line() -> EyreResult<(Settings, ArgMatches)> {
settingsrw.core.protected_store.new_device_encryption_key_password = Some(matches.value_of("new-password").unwrap().to_owned()); settingsrw.core.protected_store.new_device_encryption_key_password = Some(matches.value_of("new-password").unwrap().to_owned());
} }
if matches.occurrences_of("network-key") != 0 { if matches.occurrences_of("network-key") != 0 {
settingsrw.core.network.network_key_password = Some(matches.value_of("new-password").unwrap().to_owned()); settingsrw.core.network.network_key_password = Some(matches.value_of("network-key").unwrap().to_owned());
} }
if matches.occurrences_of("dump-txt-record") != 0 { if matches.occurrences_of("dump-txt-record") != 0 {