public-mirrors
/
innernet
mirror of https://github.com/tonarino/innernet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

client: small cleanups

pull/48/head
Jake McGinty 2021-04-10 16:03:39 +09:00
parent 6c55dafce6
commit 0feb34690e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/main.rs
View File

@ -1,5 +1,5 @@
use colored::*; use colored::*;
use dialoguer::{theme::ColorfulTheme, Confirm, Input}; use dialoguer::{Confirm, Input};
use hostsfile::HostsBuilder; use hostsfile::HostsBuilder;
use indoc::printdoc; use indoc::printdoc;
use shared::{ use shared::{
@ -182,11 +182,10 @@ fn update_hosts_file(
} }
fn install(invite: &Path, hosts_file: Option<PathBuf>) -> Result<(), Error> { fn install(invite: &Path, hosts_file: Option<PathBuf>) -> Result<(), Error> {
let theme = ColorfulTheme::default();
shared::ensure_dirs_exist(&[*CLIENT_CONFIG_PATH])?; shared::ensure_dirs_exist(&[*CLIENT_CONFIG_PATH])?;
let mut config = InterfaceConfig::from_file(invite)?; let mut config = InterfaceConfig::from_file(invite)?;
let iface = Input::with_theme(&theme) let iface = Input::with_theme(&*prompts::THEME)
.with_prompt("Interface name") .with_prompt("Interface name")
.default(config.interface.network_name.clone()) .default(config.interface.network_name.clone())
.interact()?; .interact()?;
@ -246,7 +245,7 @@ fn install(invite: &Path, hosts_file: Option<PathBuf>) -> Result<(), Error> {
fetch(&iface, false, hosts_file)?; fetch(&iface, false, hosts_file)?;
if Confirm::with_theme(&theme) if Confirm::with_theme(&*prompts::THEME)
.with_prompt(&format!( .with_prompt(&format!(
"Delete invitation file \"{}\" now? (It's no longer needed)", "Delete invitation file \"{}\" now? (It's no longer needed)",
invite.to_string_lossy().yellow() invite.to_string_lossy().yellow()