uqbar-dao/nectar
1
1
Fork 0
mirror of https://github.com/uqbar-dao/nectar.git synced 2024-12-23 08:32:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: terminal detached is actually detached and works on both sim and non-sim

Browse Source
This commit is contained in:
dr-frmr 2024-07-18 21:01:01 +02:00
parent 1b8c5eb447
commit 284d5a99f8
No known key found for this signature in database
3 changed files with 578 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kinode/src/main.rs
View File

@ -77,14 +77,12 @@ async fn main() {
let rpc = matches.get_one::<String>("rpc");
let password = matches.get_one::<String>("password");
// if we are in sim-mode, detached determines whether terminal is interactive
#[cfg(not(feature = "simulation-mode"))]
let is_detached = false;
// detached determines whether terminal is interactive
let is_detached = *matches.get_one::<bool>("detached").unwrap();
#[cfg(feature = "simulation-mode")]
let (fake_node_name, is_detached, fakechain_port) = (
let (fake_node_name, fakechain_port) = (
matches.get_one::<String>("fake-node-name"),
*matches.get_one::<bool>("detached").unwrap(),
matches.get_one::<u16>("fakechain-port").cloned(),
);
@ -654,6 +652,10 @@ fn build_command() -> Command {
.default_value("true")
.value_parser(value_parser!(bool)),
)
.arg(
arg!(--detached <IS_DETACHED> "Run in detached mode (don't accept input)")
.action(clap::ArgAction::SetTrue),
)
.arg(arg!(--rpc <RPC> "Add a WebSockets RPC URL at boot"))
.arg(arg!(--password <PASSWORD> "Node password (in double quotes)"));
@ -663,10 +665,6 @@ fn build_command() -> Command {
.arg(
arg!(--"fakechain-port" <FAKECHAIN_PORT> "Port to bind to for fakechain")
.value_parser(value_parser!(u16)),
)
.arg(
arg!(--detached <IS_DETACHED> "Run in detached mode (don't accept input)")
.action(clap::ArgAction::SetTrue),
);
app
}

1070
kinode/src/terminal/mod.rs
View File

File diff suppressed because it is too large Load Diff

4
kinode/src/terminal/utils.rs
View File

@ -63,6 +63,7 @@ pub fn startup(
,/ /` `
.*`
networking public key: {}
{}
"#,
our.name,
if our.is_direct() {
@ -72,6 +73,7 @@ pub fn startup(
},
version,
our.networking_key,
if is_detached { "(detached)" } else { "" }
)),
crossterm::style::ResetColor
)
@ -95,6 +97,7 @@ pub fn startup(
version {}
a general purpose sovereign cloud computer
net pubkey: {}
{}
"#,
our.name,
if our.is_direct() {
@ -104,6 +107,7 @@ pub fn startup(
},
version,
our.networking_key,
if is_detached { "(detached)" } else { "" }
)),
crossterm::style::ResetColor
)?;