Skip to content

Print the default help to stdout with no args or flags #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
str4d merged 4 commits into from
Jan 8, 2020
Merged

Print the default help to stdout with no args or flags #53

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8451f2c
Use updated gumdrop so we can print the default help to stdout with n…
dconnolly Jan 7, 2020
422c1c6
Reverting Cargo.lock changes
dconnolly Jan 7, 2020
c7e4fda
Display standard help dialog if TTY and the only arg is the command n…
dconnolly Jan 7, 2020
c305e85
Revert gumdrop version bump
dconnolly Jan 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/bin/rage/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,24 @@ fn decrypt(opts: AgeOptions) -> Result<(), error::DecryptError> {
}

fn main() -> Result<(), error::Error> {
use std::env::args;

env_logger::builder().format_timestamp(None).init();

let args = args().collect::<Vec<_>>();

// If you are piping input with no other args, this will not allow
// it.
if console::user_attended() && args.len() == 1 {
// If gumdrop ever merges that PR, that can be used here
// instead.
println!("Usage: {} [OPTIONS]", args[0]);
println!();
println!("{}", AgeOptions::usage());

return Ok(());
}

let opts = AgeOptions::parse_args_default_or_exit();

if opts.decrypt {
Expand Down