diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2021-03-21 15:01:18 +0100 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2021-03-21 15:01:18 +0100 |
| commit | f4f9df5ab9cc40c11164e7e696ed3a60dc7b8e34 (patch) | |
| tree | f5aa3e428e6cc39e0b0294f85090756b26553a4f | |
| parent | abbea6a4a20ed1562d99ce5942154352bc545eb5 (diff) | |
| download | mum-f4f9df5ab9cc40c11164e7e696ed3a60dc7b8e34.tar.gz | |
mumctl uses clap's App::version()
| -rw-r--r-- | mumctl/build.rs | 3 | ||||
| -rw-r--r-- | mumctl/src/main.rs | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/mumctl/build.rs b/mumctl/build.rs index f09b1c4..6ac9329 100644 --- a/mumctl/build.rs +++ b/mumctl/build.rs @@ -2,8 +2,7 @@ use std::process::Command; fn main() { let version = format!( - "{} {}-{}", - env!("CARGO_PKG_NAME"), + "{}-{}", env!("CARGO_PKG_VERSION"), commit_hash().unwrap_or_else(|| "???".to_string()), ); diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index 12de262..d07a482 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -47,17 +47,13 @@ impl log::Log for SimpleLogger { static LOGGER: SimpleLogger = SimpleLogger; fn main() { - if std::env::args().find(|s| s.as_str() == "--version").is_some() { - println!(env!("VERSION")); - return; - } - log::set_logger(&LOGGER) .map(|()| log::set_max_level(LevelFilter::Info)).unwrap(); let mut config = config::read_default_cfg(); let mut app = App::new("mumctl") .setting(AppSettings::ArgRequiredElseHelp) + .version(env!("VERSION")) .subcommand( SubCommand::with_name("connect") .about("Connect to a server") |