diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2020-11-21 16:19:40 +0100 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2020-11-21 16:19:40 +0100 |
| commit | c9c56a2f64756229db9eaf093dc5e31db0886c4e (patch) | |
| tree | 995ef4365689aba53cfeb8318b4b76f209e6bf72 | |
| parent | 417b09d31c5a19642c5c879fbce55528a675ca1a (diff) | |
| parent | 1fe6a2d8d37a2a66c926b725b6cd461baac26f3e (diff) | |
| download | mum-c9c56a2f64756229db9eaf093dc5e31db0886c4e.tar.gz | |
Merge branch 'reorder-commands' into main
| -rw-r--r-- | mumctl/src/main.rs | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index 22e08ec..5ce521a 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -26,21 +26,21 @@ fn main() { let mut app = App::new("mumctl") .setting(AppSettings::ArgRequiredElseHelp) .subcommand( + SubCommand::with_name("connect") + .arg(Arg::with_name("host").required(true)) + .arg(Arg::with_name("username")) + .arg( + Arg::with_name("port") + .long("port") + .short("p") + .takes_value(true), + ), + ) + .subcommand(SubCommand::with_name("disconnect")) + .subcommand( SubCommand::with_name("server") .setting(AppSettings::ArgRequiredElseHelp) .subcommand( - SubCommand::with_name("connect") - .arg(Arg::with_name("host").required(true)) - .arg(Arg::with_name("username")) - .arg( - Arg::with_name("port") - .long("port") - .short("p") - .takes_value(true), - ), - ) - .subcommand(SubCommand::with_name("disconnect")) - .subcommand( SubCommand::with_name("config") .arg(Arg::with_name("server_name")) .arg(Arg::with_name("var_name")) @@ -140,12 +140,12 @@ fn main() { let matches = app.clone().get_matches(); - if let Some(matches) = matches.subcommand_matches("server") { - if let Some(matches) = matches.subcommand_matches("connect") { - match_server_connect(matches, &config); - } else if let Some(_) = matches.subcommand_matches("disconnect") { - err_print!(send_command(Command::ServerDisconnect)); - } else if let Some(matches) = matches.subcommand_matches("config") { + if let Some(matches) = matches.subcommand_matches("connect") { + match_server_connect(matches, &config); + } else if let Some(_) = matches.subcommand_matches("disconnect") { + err_print!(send_command(Command::ServerDisconnect)); + } else if let Some(matches) = matches.subcommand_matches("server") { + if let Some(matches) = matches.subcommand_matches("config") { match_server_config(matches, &mut config); } else if let Some(matches) = matches.subcommand_matches("rename") { match_server_rename(matches, &mut config); |