Skip to content

fix: include service name in help usage #866

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

Open
zerone0x wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −2
Open

fix: include service name in help usage #866

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions crates/google-workspace-cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,12 @@ async fn run() -> Result<(), GwsError> {
.map_err(|e| GwsError::Discovery(format!("{e:#}")))?
};

// Build the dynamic command tree (all commands shown regardless of auth state)
let cli = commands::build_cli(&doc);
// Build the dynamic command tree (all commands shown regardless of auth state).
// Clap only sees the service-specific subcommand tree after we strip the
// service name from argv below, so teach it the full binary invocation for
// help/usage rendering. Otherwise nested help text for commands such as
// `gws sheets spreadsheets --help` incorrectly starts at `gws spreadsheets`.
let cli = commands::build_cli(&doc).bin_name(format!("gws {first_arg}"));

// Re-parse args (skip argv[0] which is the binary, and argv[1] which is the service name)
// Filter out --api-version and its value
Expand Down
Loading