diff options
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/atuin/src/command/client/doctor.rs | 2 | ||||
| -rw-r--r-- | crates/atuin/src/command/client/info.rs | 4 | ||||
| -rw-r--r-- | crates/atuin/src/main.rs | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/crates/atuin/src/command/client/doctor.rs b/crates/atuin/src/command/client/doctor.rs index 83d9e84c..975b4cf3 100644 --- a/crates/atuin/src/command/client/doctor.rs +++ b/crates/atuin/src/command/client/doctor.rs @@ -296,6 +296,7 @@ impl SettingPaths { #[derive(Debug, Serialize)] struct AtuinInfo { pub version: String, + pub commit: String, /// Whether the main Atuin sync server is in use /// I'm just calling it Atuin Cloud for lack of a better name atm @@ -328,6 +329,7 @@ impl AtuinInfo { Self { version: crate::VERSION.to_string(), + commit: crate::SHA.to_string(), sync, sqlite_version, setting_paths: SettingPaths::new(settings), diff --git a/crates/atuin/src/command/client/info.rs b/crates/atuin/src/command/client/info.rs index 60ba1fe6..efc107e3 100644 --- a/crates/atuin/src/command/client/info.rs +++ b/crates/atuin/src/command/client/info.rs @@ -1,6 +1,6 @@ use atuin_client::settings::Settings;
-use crate::VERSION;
+use crate::{SHA, VERSION};
pub fn run(settings: &Settings) {
let config = atuin_common::utils::config_dir();
@@ -23,7 +23,7 @@ pub fn run(settings: &Settings) { std::env::var("ATUIN_CONFIG_DIR").unwrap_or_else(|_| "None".into())
);
- let general_info = format!("Version info:\nversion: {VERSION}");
+ let general_info = format!("Version info:\nversion: {VERSION}\ncommit: {SHA}");
let print_out = format!("{config_paths}\n\n{env_vars}\n\n{general_info}");
diff --git a/crates/atuin/src/main.rs b/crates/atuin/src/main.rs index eaa58664..8b6947e3 100644 --- a/crates/atuin/src/main.rs +++ b/crates/atuin/src/main.rs @@ -14,6 +14,8 @@ mod sync; const VERSION: &str = env!("CARGO_PKG_VERSION"); const SHA: &str = env!("GIT_HASH"); +const LONG_VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), " (", env!("GIT_HASH"), ")"); + static HELP_TEMPLATE: &str = "\ {before-help}{name} {version} {author} @@ -29,6 +31,7 @@ static HELP_TEMPLATE: &str = "\ #[command( author = "Ellie Huxtable <ellie@atuin.sh>", version = VERSION, + long_version = LONG_VERSION, help_template(HELP_TEMPLATE), )] struct Atuin { |
