matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix clap for external subcommands

Browse source
This commit is contained in:
mario 2016-09-03 12:39:21 +02:00 committed by Matthias Beyer
parent a740dcd7ba
commit 1900d6922c
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/src/main.rs
View file

@ -126,10 +126,6 @@ pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
.multiple(false) .multiple(false)
.help("Show help")) .help("Show help"))
.subcommand(SubCommand::with_name("help").help("Show help")) .subcommand(SubCommand::with_name("help").help("Show help"))
.subcommands(get_commands()
.iter()
.map(|cmd| SubCommand::with_name(cmd))
)
} }
fn main() { fn main() {
@ -177,7 +173,7 @@ fn main() {
match matches.subcommand() { match matches.subcommand() {
(subcommand, Some(scmd)) => { (subcommand, Some(scmd)) => {
let subcommand_args : Vec<&str> = scmd.values_of(subcommand).unwrap().collect(); let subcommand_args : Vec<&str> = scmd.values_of("").unwrap().collect();
debug!("Calling 'imag-{}' with args: {:?}", subcommand, subcommand_args); debug!("Calling 'imag-{}' with args: {:?}", subcommand, subcommand_args);
match Command::new(format!("imag-{}", subcommand)) match Command::new(format!("imag-{}", subcommand))
@ -202,6 +198,7 @@ fn main() {
match e.kind() { match e.kind() {
ErrorKind::NotFound => { ErrorKind::NotFound => {
println!("No such command: 'imag-{}'", subcommand); println!("No such command: 'imag-{}'", subcommand);
println!("See 'imag --help' for available subcommands");
exit(2); exit(2);
}, },
ErrorKind::PermissionDenied => { ErrorKind::PermissionDenied => {