diff --git a/installer/src/main.rs b/installer/src/main.rs index b8fca4f..17f0831 100644 --- a/installer/src/main.rs +++ b/installer/src/main.rs @@ -4,8 +4,8 @@ use env_logger::Env; mod orbic; mod tplink; -mod wingtech; mod util; +mod wingtech; pub static CONFIG_TOML: &str = include_str!("../../dist/config.toml.example"); pub static RAYHUNTER_DAEMON_INIT: &str = include_str!("../../dist/scripts/rayhunter_daemon"); diff --git a/installer/src/orbic.rs b/installer/src/orbic.rs index 3e5a38a..a09e7af 100644 --- a/installer/src/orbic.rs +++ b/installer/src/orbic.rs @@ -9,8 +9,8 @@ use nusb::{Device, Interface}; use sha2::{Digest, Sha256}; use tokio::time::sleep; -use crate::{CONFIG_TOML, RAYHUNTER_DAEMON_INIT}; use crate::util::echo; +use crate::{CONFIG_TOML, RAYHUNTER_DAEMON_INIT}; pub const ORBIC_NOT_FOUND: &str = r#"No Orbic device found. Make sure your device is plugged in and turned on. diff --git a/installer/src/util.rs b/installer/src/util.rs index 0280c7b..1f7ce86 100644 --- a/installer/src/util.rs +++ b/installer/src/util.rs @@ -2,7 +2,7 @@ use std::io::Write; use std::net::SocketAddr; use std::time::Duration; -use anyhow::{bail, Result}; +use anyhow::{Result, bail}; use tokio::io::{AsyncReadExt, AsyncWriteExt}; use tokio::net::TcpStream; use tokio::time::{sleep, timeout}; diff --git a/installer/src/wingtech.rs b/installer/src/wingtech.rs index 576d0df..94a7645 100644 --- a/installer/src/wingtech.rs +++ b/installer/src/wingtech.rs @@ -140,7 +140,8 @@ async fn wingtech_run_install(admin_ip: String, admin_password: String) -> Resul format!("http://{admin_ip}:8080/index.html"), Duration::from_secs(3), max_failures, - ).await?; + ) + .await?; println!("ok"); println!("rayhunter is running at http://{admin_ip}:8080");