WIP
This commit is contained in:
parent
fce417214d
commit
df3a9acbfb
2 changed files with 6 additions and 3 deletions
|
@ -51,7 +51,7 @@ pub(super) fn run() -> Result<(), ValidationError> {
|
||||||
cprintln!("<bold>Note:</> This is only a formal validation, so this does not guarantee that the settings are appropriate.");
|
cprintln!("<bold>Note:</> This is only a formal validation, so this does not guarantee that the settings are appropriate.");
|
||||||
}
|
}
|
||||||
|
|
||||||
server_validation_result.and_then(|_| client_validation_result)
|
server_validation_result.and(client_validation_result)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_server_toml() -> Result<server::Config, ReadError> {
|
fn read_server_toml() -> Result<server::Config, ReadError> {
|
||||||
|
|
|
@ -3,6 +3,7 @@ mod config;
|
||||||
|
|
||||||
use clap::{Parser, Subcommand};
|
use clap::{Parser, Subcommand};
|
||||||
use color_print::cprintln;
|
use color_print::cprintln;
|
||||||
|
use std::process::ExitCode;
|
||||||
|
|
||||||
/// latest Firefish version as of this fishctl release
|
/// latest Firefish version as of this fishctl release
|
||||||
const FIREFISH_VERSION: &str = "20240613";
|
const FIREFISH_VERSION: &str = "20240613";
|
||||||
|
@ -34,7 +35,7 @@ async fn run() -> Result<(), command::Error> {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() {
|
async fn main() -> ExitCode {
|
||||||
let res = run().await;
|
let res = run().await;
|
||||||
|
|
||||||
if let Err(err) = res {
|
if let Err(err) = res {
|
||||||
|
@ -49,6 +50,8 @@ async fn main() {
|
||||||
err = src;
|
err = src;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::process::exit(1);
|
return ExitCode::FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ExitCode::SUCCESS
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue